Skip to content

Commit e9cbdea

Browse files
matyhtfmatyhtf
committed
Fix compilation warning
1 parent d780f30 commit e9cbdea

File tree

5 files changed

+72
-74
lines changed

5 files changed

+72
-74
lines changed

‎ext-src/swoole_curl.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ long Multi::select(php_curlm *mh, double timeout) {
243243
for (zend_llist_element *element = mh->easyh.head; element; element = element->next) {
244244
zval *z_ch = (zval *) element->data;
245245
php_curl *ch;
246-
if ((ch = _php_curl_get_handle(z_ch, false)) == NULL) {
246+
if ((ch = swoole_curl_get_handle(z_ch, false)) == NULL) {
247247
continue;
248248
}
249249
Handle *handle = get_handle(ch->cp);
@@ -268,7 +268,7 @@ long Multi::select(php_curlm *mh, double timeout) {
268268
for (zend_llist_element *element = mh->easyh.head; element; element = element->next) {
269269
zval *z_ch = (zval *) element->data;
270270
php_curl *ch;
271-
if ((ch = _php_curl_get_handle(z_ch, false)) == NULL) {
271+
if ((ch = swoole_curl_get_handle(z_ch, false)) == NULL) {
272272
continue;
273273
}
274274
Handle *handle = get_handle(ch->cp);

‎include/swoole_memory.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
//-------------------memory manager-------------------------
2323
namespace swoole {
2424

25-
#pragma pack(8)
26-
2725
class MemoryPool {
2826
public:
2927
virtual ~MemoryPool(){};

‎thirdparty/php/curl/curl_private.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ typedef struct _php_curlsh {
150150
zend_object std;
151151
} php_curlsh;
152152

153-
php_curl *init_curl_handle_into_zval(zval *curl);
154-
void init_curl_handle(php_curl *ch);
155-
void _php_curl_cleanup_handle(php_curl *);
156-
void _php_curl_multi_cleanup_list(void *data);
157-
void _php_curl_verify_handlers(php_curl *ch, int reporterror);
158-
void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source);
153+
php_curl *swoole_curl_init_handle_into_zval(zval *curl);
154+
void swoole_curl_init_handle(php_curl *ch);
155+
void swoole_curl_cleanup_handle(php_curl *);
156+
void swoole_curl_multi_cleanup_list(void *data);
157+
void swoole_curl_verify_handlers(php_curl *ch, int reporterror);
158+
void swoole_setup_easy_copy_handlers(php_curl *ch, php_curl *source);
159159

160160
#if PHP_VERSION_ID >= 80000
161161
static inline php_curl *curl_from_obj(zend_object *obj) {
@@ -172,19 +172,19 @@ static inline php_curlsh *curl_share_from_obj(zend_object *obj) {
172172
void curl_multi_register_class(const zend_function_entry *method_entries);
173173
int curl_cast_object(zend_object *obj, zval *result, int type);
174174
#else
175-
#define Z_CURL_P(zv) _php_curl_get_handle(zv)
175+
#define Z_CURL_P(zv) swoole_curl_get_handle(zv)
176176
#endif /* PHP8 end */
177177

178-
php_curl *_php_curl_get_handle(zval *zid, bool exclusive = true, bool required = true);
178+
php_curl *swoole_curl_get_handle(zval *zid, bool exclusive = true, bool required = true);
179179

180180
SW_EXTERN_C_BEGIN
181181
#if PHP_VERSION_ID < 80000
182-
void _php_curl_close_ex(php_curl *ch);
183-
void _php_curl_close(zend_resource *rsrc);
184-
void _php_curl_multi_close(zend_resource *rsrc);
185-
php_curl *alloc_curl_handle();
186-
int _php_curl_get_le_curl();
187-
int _php_curl_get_le_curl_multi();
182+
void swoole_curl_close_ex(php_curl *ch);
183+
void swoole_curl_close(zend_resource *rsrc);
184+
void swoole_curl_multi_close(zend_resource *rsrc);
185+
php_curl *swoole_curl_alloc_handle();
186+
int swoole_curl_get_le_curl();
187+
int swoole_curl_get_le_curl_multi();
188188
#endif
189189
SW_EXTERN_C_END
190190

‎thirdparty/php/curl/interface.cc

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ static zend_object_handlers swoole_native_curl_exception_handlers;
8686
static int le_curl;
8787
static int le_curl_multi_handle;
8888

89-
int _php_curl_get_le_curl() {
89+
int swoole_curl_get_le_curl() {
9090
return le_curl;
9191
}
9292

93-
int _php_curl_get_le_curl_multi() {
93+
int swoole_curl_get_le_curl_multi() {
9494
return le_curl_multi_handle;
9595
}
9696

@@ -112,7 +112,7 @@ int _php_curl_get_le_curl_multi() {
112112
return;
113113
#endif
114114

115-
php_curl *_php_curl_get_handle(zval *zid, bool exclusive, bool required) {
115+
php_curl *swoole_curl_get_handle(zval *zid, bool exclusive, bool required) {
116116
php_curl *ch;
117117
#if PHP_VERSION_ID >= 80000
118118
ch = Z_CURL_P(zid);
@@ -223,7 +223,7 @@ static int php_curl_option_url(http://github.com/php_curl%20*ch,%20const%20char%20*url,%20const%20size_t%20len)
223223
}
224224
/* }}} */
225225

226-
void _php_curl_verify_handlers(php_curl *ch, int reporterror) /* {{{ */
226+
void swoole_curl_verify_handlers(php_curl *ch, int reporterror) /* {{{ */
227227
{
228228
php_stream *stream;
229229

@@ -329,9 +329,9 @@ void swoole_native_curl_minit(int module_number) {
329329
zend_register_functions(NULL, swoole_native_curl_functions, NULL, MODULE_PERSISTENT);
330330

331331
#else
332-
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, le_curl_name, module_number);
332+
le_curl = zend_register_list_destructors_ex(swoole_curl_close, NULL, le_curl_name, module_number);
333333
le_curl_multi_handle =
334-
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, le_curl_multi_handle_name, module_number);
334+
zend_register_list_destructors_ex(swoole_curl_multi_close, NULL, le_curl_multi_handle_name, module_number);
335335
#endif
336336

337337
SW_INIT_CLASS_ENTRY_EX(swoole_native_curl_exception,
@@ -379,7 +379,7 @@ static zend_object *curl_clone_obj(zend_object *object) {
379379
}
380380

381381
clone_ch->cp = cp;
382-
_php_setup_easy_copy_handlers(clone_ch, ch);
382+
swoole_setup_easy_copy_handlers(clone_ch, ch);
383383

384384
postfields = &clone_ch->postfields;
385385
if (Z_TYPE_P(postfields) != IS_UNDEF) {
@@ -518,7 +518,7 @@ static size_t fn_write(char *data, size_t size, size_t nmemb, void *ctx) {
518518
php_error_docref(NULL, E_WARNING, "Could not call the CURLOPT_WRITEFUNCTION");
519519
length = -1;
520520
} else if (!Z_ISUNDEF(retval)) {
521-
_php_curl_verify_handlers(ch, 1);
521+
swoole_curl_verify_handlers(ch, 1);
522522
length = zval_get_long(&retval);
523523
}
524524

@@ -574,7 +574,7 @@ static int fn_fnmatch(void *ctx, const char *pattern, const char *string) {
574574
if (error == FAILURE) {
575575
php_error_docref(NULL, E_WARNING, "Cannot call the CURLOPT_FNMATCH_FUNCTION");
576576
} else if (!Z_ISUNDEF(retval)) {
577-
_php_curl_verify_handlers(ch, 1);
577+
swoole_curl_verify_handlers(ch, 1);
578578
rval = zval_get_long(&retval);
579579
}
580580
zval_ptr_dtor(&argv[0]);
@@ -643,7 +643,7 @@ static size_t fn_progress(void *clientp, double dltotal, double dlnow, double ul
643643
if (error == FAILURE) {
644644
php_error_docref(NULL, E_WARNING, "Cannot call the CURLOPT_PROGRESSFUNCTION");
645645
} else if (!Z_ISUNDEF(retval)) {
646-
_php_curl_verify_handlers(ch, 1);
646+
swoole_curl_verify_handlers(ch, 1);
647647
if (0 != zval_get_long(&retval)) {
648648
rval = 1;
649649
}
@@ -707,7 +707,7 @@ static size_t fn_read(char *data, size_t size, size_t nmemb, void *ctx) {
707707
php_error_docref(NULL, E_WARNING, "Cannot call the CURLOPT_READFUNCTION");
708708
length = CURL_READFUNC_ABORT;
709709
} else if (!Z_ISUNDEF(retval)) {
710-
_php_curl_verify_handlers(ch, 1);
710+
swoole_curl_verify_handlers(ch, 1);
711711
if (Z_TYPE(retval) == IS_STRING) {
712712
length = MIN((int) (size * nmemb), Z_STRLEN(retval));
713713
memcpy(data, Z_STRVAL(retval), length);
@@ -779,7 +779,7 @@ static size_t fn_write_header(char *data, size_t size, size_t nmemb, void *ctx)
779779
php_error_docref(NULL, E_WARNING, "Could not call the CURLOPT_HEADERFUNCTION");
780780
length = -1;
781781
} else if (!Z_ISUNDEF(retval)) {
782-
_php_curl_verify_handlers(ch, 1);
782+
swoole_curl_verify_handlers(ch, 1);
783783
length = zval_get_long(&retval);
784784
}
785785
zval_ptr_dtor(&argv[0]);
@@ -874,7 +874,7 @@ php_curl *init_curl_handle_into_zval(zval *curl) {
874874
#if PHP_VERSION_ID >= 80000
875875
void init_curl_handle(php_curl *ch)
876876
#else
877-
php_curl *alloc_curl_handle()
877+
php_curl *swoole_curl_alloc_handle()
878878
#endif
879879
{
880880
#if PHP_VERSION_ID < 80000
@@ -1002,7 +1002,7 @@ PHP_FUNCTION(swoole_native_curl_init) {
10021002
#if PHP_VERSION_ID >= 80000
10031003
ch = init_curl_handle_into_zval(return_value);
10041004
#else
1005-
ch = alloc_curl_handle();
1005+
ch = swoole_curl_alloc_handle();
10061006
#endif
10071007

10081008
ch->cp = cp;
@@ -1018,7 +1018,7 @@ PHP_FUNCTION(swoole_native_curl_init) {
10181018
#if PHP_VERSION_ID >= 80000
10191019
zval_ptr_dtor(return_value);
10201020
#else
1021-
_php_curl_close_ex(ch);
1021+
swoole_curl_close_ex(ch);
10221022
#endif
10231023
RETURN_FALSE;
10241024
}
@@ -1031,7 +1031,7 @@ PHP_FUNCTION(swoole_native_curl_init) {
10311031
}
10321032
/* }}} */
10331033

1034-
void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source) {
1034+
void swoole_setup_easy_copy_handlers(php_curl *ch, php_curl *source) {
10351035
if (!Z_ISUNDEF(source->handlers->write->stream)) {
10361036
Z_ADDREF(source->handlers->write->stream);
10371037
}
@@ -1360,7 +1360,7 @@ PHP_FUNCTION(swoole_native_curl_copy_handle) {
13601360
#endif
13611361
ZEND_PARSE_PARAMETERS_END();
13621362

1363-
if ((ch = _php_curl_get_handle(zid)) == NULL) {
1363+
if ((ch = swoole_curl_get_handle(zid)) == NULL) {
13641364
RETURN_FALSE;
13651365
}
13661366

@@ -1373,11 +1373,11 @@ PHP_FUNCTION(swoole_native_curl_copy_handle) {
13731373
#if PHP_VERSION_ID >= 80000
13741374
dupch = init_curl_handle_into_zval(return_value);
13751375
#else
1376-
dupch = alloc_curl_handle();
1376+
dupch = swoole_curl_alloc_handle();
13771377
#endif
13781378
dupch->cp = cp;
13791379

1380-
_php_setup_easy_copy_handlers(dupch, ch);
1380+
swoole_setup_easy_copy_handlers(dupch, ch);
13811381

13821382
#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
13831383
postfields = &ch->postfields;
@@ -1386,7 +1386,7 @@ PHP_FUNCTION(swoole_native_curl_copy_handle) {
13861386
#if PHP_VERSION_ID >= 80000
13871387
zval_ptr_dtor(return_value);
13881388
#else
1389-
_php_curl_close_ex(dupch);
1389+
swoole_curl_close_ex(dupch);
13901390
#endif
13911391
php_error_docref(NULL, E_WARNING, "Cannot rebuild mime structure");
13921392
RETURN_FALSE;
@@ -2203,7 +2203,7 @@ PHP_FUNCTION(swoole_native_curl_setopt) {
22032203
Z_PARAM_ZVAL(zvalue)
22042204
ZEND_PARSE_PARAMETERS_END();
22052205

2206-
if ((ch = _php_curl_get_handle(zid, false)) == NULL) {
2206+
if ((ch = swoole_curl_get_handle(zid, false)) == NULL) {
22072207
RETURN_FALSE;
22082208
}
22092209

@@ -2236,7 +2236,7 @@ PHP_FUNCTION(swoole_native_curl_setopt_array) {
22362236
Z_PARAM_ARRAY(arr)
22372237
ZEND_PARSE_PARAMETERS_END();
22382238

2239-
if ((ch = _php_curl_get_handle(zid, false)) == NULL) {
2239+
if ((ch = swoole_curl_get_handle(zid, false)) == NULL) {
22402240
RETURN_FALSE;
22412241
}
22422242

@@ -2262,7 +2262,7 @@ PHP_FUNCTION(swoole_native_curl_setopt_array) {
22622262

22632263
/* {{{ _php_curl_cleanup_handle(ch)
22642264
Cleanup an execution phase */
2265-
void _php_curl_cleanup_handle(php_curl *ch) {
2265+
void swoole_curl_cleanup_handle(php_curl *ch) {
22662266
smart_str_free(&ch->handlers->write->buf);
22672267
if (ch->header.str) {
22682268
zend_string_release(ch->header.str);
@@ -2289,13 +2289,13 @@ PHP_FUNCTION(swoole_native_curl_exec) {
22892289
#endif
22902290
ZEND_PARSE_PARAMETERS_END();
22912291

2292-
if ((ch = _php_curl_get_handle(zid)) == NULL) {
2292+
if ((ch = swoole_curl_get_handle(zid)) == NULL) {
22932293
RETURN_FALSE;
22942294
}
22952295

2296-
_php_curl_verify_handlers(ch, 1);
2296+
swoole_curl_verify_handlers(ch, 1);
22972297

2298-
_php_curl_cleanup_handle(ch);
2298+
swoole_curl_cleanup_handle(ch);
22992299

23002300
Multi multi{};
23012301
error = multi.exec(ch);
@@ -2362,7 +2362,7 @@ PHP_FUNCTION(swoole_native_curl_getinfo) {
23622362
#endif
23632363
ZEND_PARSE_PARAMETERS_END();
23642364

2365-
if ((ch = _php_curl_get_handle(zid, false)) == NULL) {
2365+
if ((ch = swoole_curl_get_handle(zid, false)) == NULL) {
23662366
RETURN_FALSE;
23672367
}
23682368

@@ -2629,7 +2629,7 @@ PHP_FUNCTION(swoole_native_curl_error) {
26292629
#endif
26302630
ZEND_PARSE_PARAMETERS_END();
26312631

2632-
if ((ch = _php_curl_get_handle(zid, false)) == NULL) {
2632+
if ((ch = swoole_curl_get_handle(zid, false)) == NULL) {
26332633
RETURN_FALSE;
26342634
}
26352635

@@ -2659,7 +2659,7 @@ PHP_FUNCTION(swoole_native_curl_errno) {
26592659
#endif
26602660
ZEND_PARSE_PARAMETERS_END();
26612661

2662-
if ((ch = _php_curl_get_handle(zid, false)) == NULL) {
2662+
if ((ch = swoole_curl_get_handle(zid, false)) == NULL) {
26632663
RETURN_FALSE;
26642664
}
26652665

@@ -2681,7 +2681,7 @@ PHP_FUNCTION(swoole_native_curl_close) {
26812681
#endif
26822682
ZEND_PARSE_PARAMETERS_END();
26832683

2684-
if ((ch = _php_curl_get_handle(zid)) == NULL) {
2684+
if ((ch = swoole_curl_get_handle(zid)) == NULL) {
26852685
RETURN_FALSE;
26862686
}
26872687

@@ -2787,7 +2787,7 @@ static void curl_free_obj(zend_object *object) {
27872787
return;
27882788
}
27892789

2790-
_php_curl_verify_handlers(ch, 0);
2790+
swoole_curl_verify_handlers(ch, 0);
27912791
_php_curl_free(ch);
27922792

27932793
zend_object_std_dtor(&ch->std);
@@ -2797,22 +2797,22 @@ static void curl_free_obj(zend_object *object) {
27972797
#if PHP_VERSION_ID < 80000
27982798
/* {{{ _php_curl_close_ex()
27992799
List destructor for curl handles */
2800-
void _php_curl_close_ex(php_curl *ch) {
2800+
void swoole_curl_close_ex(php_curl *ch) {
28012801
#if PHP_CURL_DEBUG
28022802
fprintf(stderr, "DTOR CALLED, ch = %x\n", ch);
28032803
#endif
28042804

2805-
_php_curl_verify_handlers(ch, 0);
2805+
swoole_curl_verify_handlers(ch, 0);
28062806
_php_curl_free(ch);
28072807
efree(ch);
28082808
}
28092809
/* }}} */
28102810

28112811
/* {{{ _php_curl_close()
28122812
List destructor for curl handles */
2813-
void _php_curl_close(zend_resource *rsrc) {
2813+
void swoole_curl_close(zend_resource *rsrc) {
28142814
php_curl *ch = (php_curl *) rsrc->ptr;
2815-
_php_curl_close_ex(ch);
2815+
swoole_curl_close_ex(ch);
28162816
}
28172817
#endif
28182818
/* }}} */
@@ -2877,7 +2877,7 @@ PHP_FUNCTION(swoole_native_curl_reset) {
28772877
#endif
28782878
ZEND_PARSE_PARAMETERS_END();
28792879

2880-
if ((ch = _php_curl_get_handle(zid)) == NULL) {
2880+
if ((ch = swoole_curl_get_handle(zid)) == NULL) {
28812881
RETURN_FALSE;
28822882
}
28832883

@@ -2909,7 +2909,7 @@ PHP_FUNCTION(swoole_native_curl_escape) {
29092909
Z_PARAM_STR(str)
29102910
ZEND_PARSE_PARAMETERS_END();
29112911

2912-
if ((ch = _php_curl_get_handle(zid)) == NULL) {
2912+
if ((ch = swoole_curl_get_handle(zid)) == NULL) {
29132913
RETURN_FALSE;
29142914
}
29152915

@@ -2982,7 +2982,7 @@ PHP_FUNCTION(swoole_native_curl_pause) {
29822982
Z_PARAM_LONG(bitmask)
29832983
ZEND_PARSE_PARAMETERS_END();
29842984

2985-
if ((ch = _php_curl_get_handle(zid)) == NULL) {
2985+
if ((ch = swoole_curl_get_handle(zid)) == NULL) {
29862986
RETURN_FALSE;
29872987
}
29882988

0 commit comments

Comments
 (0)