rename

Author: matyhtf

php_swoole.h

@@ -114,15 +114,15 @@ extern swoole_object_array swoole_objects;
 #define SW_CHECK_RETURN(s)      if(s<0){RETURN_FALSE;}else{RETURN_TRUE;}
 #define SW_LOCK_CHECK_RETURN(s) if(s==0){RETURN_TRUE;}else{zend_update_property_long(NULL,getThis(),SW_STRL("errCode"),s);RETURN_FALSE;}
 
-#define swoole_php_fatal_error(level, fmt_str, ...) \
+#define php_swoole_fatal_error(level, fmt_str, ...) \
         php_error_docref(NULL, level, (const char *) (fmt_str), ##__VA_ARGS__)
 
-#define swoole_php_error(level, fmt_str, ...) \
+#define php_swoole_error(level, fmt_str, ...) \
     if (SWOOLE_G(display_errors) || level == E_ERROR) \
-        swoole_php_fatal_error(level, fmt_str, ##__VA_ARGS__)
+        php_swoole_fatal_error(level, fmt_str, ##__VA_ARGS__)
 
-#define swoole_php_sys_error(level, fmt_str, ...) \
-        swoole_php_error(level, fmt_str ", Error: %s[%d]", ##__VA_ARGS__, strerror(errno), errno)
+#define php_swoole_sys_error(level, fmt_str, ...) \
+        php_swoole_error(level, fmt_str ", Error: %s[%d]", ##__VA_ARGS__, strerror(errno), errno)
 
 #ifdef SW_USE_OPENSSL
 #ifndef HAVE_OPENSSL
@@ -450,8 +450,6 @@ ssize_t php_swoole_length_func(swProtocol *protocol, swConnection *conn, char *d
 int php_swoole_client_onPackage(swConnection *conn, char *data, uint32_t length);
 zend_bool php_swoole_signal_isset_handler(int signo);
 
-int php_coroutine_reactor_can_exit(swReactor *reactor);
-
 #ifdef SW_USE_OPENSSL
 void php_swoole_client_check_ssl_setting(swClient *cli, zval *zset);
 #endif
@@ -1149,16 +1147,15 @@ static sw_inline void sw_zend_fci_cache_free(void* fci_cache)
 }
 
 //----------------------------------Misc API------------------------------------
-
-static sw_inline char* sw_php_format_date(char *format, size_t format_len, time_t ts, int localtime)
+static sw_inline char* php_swoole_format_date(char *format, size_t format_len, time_t ts, int localtime)
 {
     zend_string *time = php_format_date(format, format_len, ts, localtime);
     char *return_str = estrndup(ZSTR_VAL(time), ZSTR_LEN(time));
     zend_string_release(time);
     return return_str;
 }
 
-static sw_inline char* sw_php_url_encode(char *value, size_t value_len, int* exten)
+static sw_inline char* php_swoole_url_encode(char *value, size_t value_len, int* exten)
 {
     zend_string *str = php_url_encode(value, value_len);
     *exten = ZSTR_LEN(str);
@@ -1167,7 +1164,7 @@ static sw_inline char* sw_php_url_encode(char *value, size_t value_len, int* ext
     return return_str;
 }
 
-static sw_inline char* sw_http_build_query(zval *zdata, size_t *length, smart_str *formstr)
+static sw_inline char* php_swoole_http_build_query(zval *zdata, size_t *length, smart_str *formstr)
 {
     if (php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, 0, NULL, 0, NULL, 0, NULL, NULL, (int) PHP_QUERY_RFC1738) == FAILURE)
     {
@@ -1186,7 +1183,7 @@ static sw_inline char* sw_http_build_query(zval *zdata, size_t *length, smart_st
     return formstr->s->val;
 }
 
-static sw_inline zend_string* sw_get_debug_print_backtrace(zend_long options, zend_long limit)
+static sw_inline zend_string* php_swoole_get_debug_print_backtrace(zend_long options, zend_long limit)
 {
     SW_PHP_OB_START(zoutput) {
         zval fcn, args[2];
@@ -1195,7 +1192,8 @@ static sw_inline zend_string* sw_get_debug_print_backtrace(zend_long options, ze
         ZVAL_LONG(&args[1], limit);
         sw_zend_call_function_ex(&fcn, NULL, 2, args, &zoutput);
         zval_ptr_dtor(&fcn);
-    } SW_PHP_OB_END();
+    }
+    SW_PHP_OB_END();
     if (UNEXPECTED(Z_TYPE_P(&zoutput) != IS_STRING))
     {
         return NULL;

swoole.cc

@@ -186,7 +186,7 @@ static sw_inline uint32_t swoole_get_new_size(uint32_t old_size, int handle)
     uint32_t new_size = old_size * 2;
     if (handle > SWOOLE_OBJECT_MAX)
     {
-        swoole_php_fatal_error(E_ERROR, "handle %d exceed %d", handle, SWOOLE_OBJECT_MAX);
+        php_swoole_fatal_error(E_ERROR, "handle %d exceed %d", handle, SWOOLE_OBJECT_MAX);
         return 0;
     }
     while (new_size <= (uint32_t) handle)
@@ -215,7 +215,7 @@ void swoole_set_object_by_handle(uint32_t handle, void *ptr)
         new_ptr = sw_realloc(old_ptr, sizeof(void*) * new_size);
         if (!new_ptr)
         {
-            swoole_php_fatal_error(E_ERROR, "malloc(%d) failed", (int )(new_size * sizeof(void *)));
+            php_swoole_fatal_error(E_ERROR, "malloc(%d) failed", (int )(new_size * sizeof(void *)));
             return;
         }
         bzero((char*) new_ptr + (old_size * sizeof(void*)), (new_size - old_size) * sizeof(void*));
@@ -256,7 +256,7 @@ void swoole_set_property_by_handle(uint32_t handle, int property_id, void *ptr)
         }
         if (new_ptr == NULL)
         {
-            swoole_php_fatal_error(E_ERROR, "malloc(%d) failed", (int )(new_size * sizeof(void *)));
+            php_swoole_fatal_error(E_ERROR, "malloc(%d) failed", (int )(new_size * sizeof(void *)));
             return;
         }
         if (old_size > 0)
@@ -657,7 +657,7 @@ PHP_MINIT_FUNCTION(swoole)
     swoole_objects.array = (void**) sw_calloc(swoole_objects.size, sizeof(void*));
     if (!swoole_objects.array)
     {
-        swoole_php_fatal_error(E_ERROR, "malloc([swoole_objects]) failed");
+        php_swoole_fatal_error(E_ERROR, "malloc([swoole_objects]) failed");
         exit(253);
     }
 
@@ -963,7 +963,7 @@ PHP_FUNCTION(swoole_set_process_name)
             ZEND_STRL("cli_set_process_title"));
     if (!cli_set_process_title)
     {
-        swoole_php_fatal_error(E_WARNING, "swoole_set_process_name only support in CLI mode");
+        php_swoole_fatal_error(E_WARNING, "swoole_set_process_name only support in CLI mode");
         RETURN_FALSE;
     }
     cli_set_process_title->internal_function.handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
@@ -978,7 +978,7 @@ PHP_FUNCTION(swoole_get_local_ip)
 
     if (getifaddrs(&ipaddrs) != 0)
     {
-        swoole_php_sys_error(E_WARNING, "getifaddrs() failed");
+        php_swoole_sys_error(E_WARNING, "getifaddrs() failed");
         RETURN_FALSE;
     }
     array_init(return_value);
@@ -1031,7 +1031,7 @@ PHP_FUNCTION(swoole_get_local_mac)
 
     if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
     {
-        swoole_php_sys_error(E_WARNING, "new socket failed");
+        php_swoole_sys_error(E_WARNING, "new socket failed");
         RETURN_FALSE;
     }
     array_init(return_value);

swoole_async_coro.cc

@@ -195,7 +195,7 @@ PHP_FUNCTION(swoole_async_set)
 {
     if (SwooleG.main_reactor != NULL)
     {
-        swoole_php_fatal_error(E_ERROR, "eventLoop has already been created. unable to change settings");
+        php_swoole_fatal_error(E_ERROR, "eventLoop has already been created. unable to change settings");
         RETURN_FALSE;
     }
 
@@ -288,13 +288,13 @@ PHP_FUNCTION(swoole_async_dns_lookup_coro)
 
     if (Z_TYPE_P(domain) != IS_STRING)
     {
-        swoole_php_fatal_error(E_WARNING, "invalid domain name");
+        php_swoole_fatal_error(E_WARNING, "invalid domain name");
         RETURN_FALSE;
     }
 
     if (Z_STRLEN_P(domain) == 0)
     {
-        swoole_php_fatal_error(E_WARNING, "domain name empty");
+        php_swoole_fatal_error(E_WARNING, "domain name empty");
         RETURN_FALSE;
     }
 

swoole_buffer.c

@@ -99,7 +99,7 @@ static void swoole_buffer_recycle(swString *buffer)
 
 static PHP_METHOD(swoole_buffer, __construct)
 {
-    swoole_php_fatal_error(
+    php_swoole_fatal_error(
         E_DEPRECATED, "Class %s is deprecated, it will be removed in v4.5.0",
         ZSTR_VAL(swoole_buffer_ce->name)
     );
@@ -212,7 +212,7 @@ static PHP_METHOD(swoole_buffer, substr)
     }
     if (length + offset > buffer->length)
     {
-        swoole_php_error(E_WARNING, "offset(" ZEND_LONG_FMT ", " ZEND_LONG_FMT ") is out of bounds", offset, length);
+        php_swoole_error(E_WARNING, "offset(" ZEND_LONG_FMT ", " ZEND_LONG_FMT ") is out of bounds", offset, length);
         RETURN_FALSE;
     }
     if (remove)

swoole_channel_coro.cc

@@ -87,7 +87,7 @@ static sw_inline Channel * swoole_get_channel(zval *zobject)
     Channel *chan = swoole_channel_coro_fetch_object(Z_OBJ_P(zobject))->chan;
     if (UNEXPECTED(!chan))
     {
-        swoole_php_fatal_error(E_ERROR, "you must call Channel constructor first");
+        php_swoole_fatal_error(E_ERROR, "you must call Channel constructor first");
     }
     return chan;
 }