rename function (#5939)

Author: NathanFreeman

thirdparty/php/curl/curl_private.h

@@ -158,7 +158,7 @@ static inline php_curl_handlers *curl_handlers(php_curl *ch) {
 
 #if PHP_VERSION_ID >= 80300
 /* Consumes `zv` */
-zend_long php_curl_get_long(zval *zv);
+zend_long swoole_curl_get_long(zval *zv);
 #endif
 
 static inline php_curl *curl_from_obj(zend_object *obj) {

thirdparty/php/curl/interface.cc

@@ -446,7 +446,7 @@ static size_t fn_write(char *data, size_t size, size_t nmemb, void *ctx) {
         } else if (!Z_ISUNDEF(retval)) {
             swoole_curl_verify_handlers(ch, /* reporterror */ true);
 #if PHP_VERSION_ID >= 80300
-            length = php_curl_get_long(&retval);
+            length = swoole_curl_get_long(&retval);
 #else
             length = zval_get_long(&retval);
 #endif
@@ -494,7 +494,7 @@ static int fn_fnmatch(void *ctx, const char *pattern, const char *string) {
     } else if (!Z_ISUNDEF(retval)) {
         swoole_curl_verify_handlers(ch, /* reporterror */ true);
 #if PHP_VERSION_ID >= 80300
-        rval = php_curl_get_long(&retval);
+        rval = swoole_curl_get_long(&retval);
 #else
         rval = zval_get_long(&retval);
 #endif
@@ -552,7 +552,7 @@ static int fn_progress(void *clientp, double dltotal, double dlnow, double ultot
     } else if (!Z_ISUNDEF(retval)) {
         swoole_curl_verify_handlers(ch, /* reporterror */ true);
 #if PHP_VERSION_ID >= 80300
-        if (0 != php_curl_get_long(&retval)) {
+        if (0 != swoole_curl_get_long(&retval)) {
 #else
         if (0 != zval_get_long(&retval)) {
 #endif
@@ -610,7 +610,7 @@ static size_t fn_xferinfo(void *clientp, curl_off_t dltotal, curl_off_t dlnow, c
     } else if (!Z_ISUNDEF(retval)) {
         swoole_curl_verify_handlers(ch, /* reporterror */ true);
 #if PHP_VERSION_ID >= 80300
-        if (0 != php_curl_get_long(&retval)) {
+        if (0 != swoole_curl_get_long(&retval)) {
 #else
         if (0 != zval_get_long(&retval)) {
 #endif
@@ -795,7 +795,7 @@ static size_t fn_write_header(char *data, size_t size, size_t nmemb, void *ctx)
         } else if (!Z_ISUNDEF(retval)) {
             swoole_curl_verify_handlers(ch, /* reporterror */ true);
 #if PHP_VERSION_ID >= 80300
-            length = php_curl_get_long(&retval);
+            length = swoole_curl_get_long(&retval);
 #else
             length = zval_get_long(&retval);
 #endif
@@ -1110,7 +1110,7 @@ void swoole_setup_easy_copy_handlers(php_curl *ch, php_curl *source) {
 }
 
 #if PHP_VERSION_ID >= 80300
-zend_long php_curl_get_long(zval *zv) {
+zend_long swoole_curl_get_long(zval *zv) {
     if (EXPECTED(Z_TYPE_P(zv) == IS_LONG)) {
         return Z_LVAL_P(zv);
     } else {

thirdparty/php/curl/multi.cc

@@ -475,7 +475,7 @@ static int _php_server_push_callback(
         php_error_docref(NULL, E_WARNING, "Cannot call the CURLMOPT_PUSHFUNCTION");
     } else if (!Z_ISUNDEF(retval)) {
 #if PHP_VERSION_ID >= 80300
-        if (CURL_PUSH_DENY != php_curl_get_long(&retval)) {
+        if (CURL_PUSH_DENY != swoole_curl_get_long(&retval)) {
 #else
         if (CURL_PUSH_DENY != zval_get_long(&retval)) {
 #endif