Skip to content

Commit d5c9247

Browse files
weltlingweltling
committed
replace *_STRTOL with STRTOI, etc.
1 parent 110c17f commit d5c9247

20 files changed

+66
-66
lines changed

‎Zend/zend_ini.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ ZEND_API zend_int_t zend_ini_int(char *name, zend_size_t name_length, int orig)
352352

353353
if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry) == SUCCESS) {
354354
if (orig && ini_entry->modified) {
355-
return (ini_entry->orig_value ? ZEND_STRTOL(ini_entry->orig_value, NULL, 0) : 0);
355+
return (ini_entry->orig_value ? ZEND_STRTOI(ini_entry->orig_value, NULL, 0) : 0);
356356
} else {
357-
return (ini_entry->value ? ZEND_STRTOL(ini_entry->value, NULL, 0) : 0);
357+
return (ini_entry->value ? ZEND_STRTOI(ini_entry->value, NULL, 0) : 0);
358358
}
359359
}
360360

‎Zend/zend_int.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ typedef long zend_off_t;
8484
# ifdef PHP_WIN32
8585
# define ZEND_ITOA(i, s, len) _i64toa_s((i), (s), (len), 10)
8686
# define ZEND_ATOI(i, s) i = _atoi64((s))
87-
# define ZEND_STRTOL(s0, s1, base) _strtoi64((s0), (s1), (base))
88-
# define ZEND_STRTOUL(s0, s1, base) _strtoui64((s0), (s1), (base))
87+
# define ZEND_STRTOI(s0, s1, base) _strtoi64((s0), (s1), (base))
88+
# define ZEND_STRTOUI(s0, s1, base) _strtoui64((s0), (s1), (base))
8989
# define ZEND_INT_FMT "%I64d"
9090
# define ZEND_UINT_FMT "%I64u"
9191
# define ZEND_INT_FMT_SPEC "I64d"
9292
# define ZEND_UINT_FMT_SPEC "I64u"
93-
# define ZEND_STRTOL_PTR _strtoi64
94-
# define ZEND_STRTOUL_PTR _strtoui64
93+
# define ZEND_STRTOI_PTR _strtoi64
94+
# define ZEND_STRTOUI_PTR _strtoui64
9595
# define ZEND_ABS _abs64
9696
# else
9797
# define ZEND_ITOA(i, s, len) \
@@ -100,19 +100,19 @@ typedef long zend_off_t;
100100
(s)[st] = '\0'; \
101101
} while (0)
102102
# define ZEND_ATOI(i, s) (i) = atoll((s))
103-
# define ZEND_STRTOL(s0, s1, base) strtoll((s0), (s1), (base))
104-
# define ZEND_STRTOUL(s0, s1, base) strtoull((s0), (s1), (base))
103+
# define ZEND_STRTOI(s0, s1, base) strtoll((s0), (s1), (base))
104+
# define ZEND_STRTOUI(s0, s1, base) strtoull((s0), (s1), (base))
105105
# define ZEND_INT_FMT "%" PRId64
106106
# define ZEND_UINT_FMT "%lu"
107107
# define ZEND_INT_FMT_SPEC PRId64
108108
# define ZEND_UINT_FMT_SPEC "lu"
109-
# define ZEND_STRTOL_PTR strtoll
110-
# define ZEND_STRTOUL_PTR strtoull
109+
# define ZEND_STRTOI_PTR strtoll
110+
# define ZEND_STRTOUI_PTR strtoull
111111
# define ZEND_ABS llabs
112112
# endif
113113
#else
114-
# define ZEND_STRTOL(s0, s1, base) strtol((s0), (s1), (base))
115-
# define ZEND_STRTOUL(s0, s1, base) strtoul((s0), (s1), (base))
114+
# define ZEND_STRTOI(s0, s1, base) strtol((s0), (s1), (base))
115+
# define ZEND_STRTOUI(s0, s1, base) strtoul((s0), (s1), (base))
116116
# ifdef PHP_WIN32
117117
# define ZEND_ITOA(i, s, len) _ltoa_s((i), (s), (len), 10)
118118
# define ZEND_ATOI(i, s) i = atol((s))
@@ -128,8 +128,8 @@ typedef long zend_off_t;
128128
# define ZEND_UINT_FMT "%lu"
129129
# define ZEND_INT_FMT_SPEC "ld"
130130
# define ZEND_UINT_FMT_SPEC "lu"
131-
# define ZEND_STRTOL_PTR strtol
132-
# define ZEND_STRTOUL_PTR strtoul
131+
# define ZEND_STRTOI_PTR strtol
132+
# define ZEND_STRTOUI_PTR strtoul
133133
# define ZEND_ABS abs
134134
#endif
135135

‎Zend/zend_language_scanner.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
941941
hex_buf[1] = *(++s);
942942
Z_STRSIZE_P(zendlval)--;
943943
}
944-
*t++ = (char) ZEND_STRTOL(hex_buf, NULL, 16);
944+
*t++ = (char) ZEND_STRTOI(hex_buf, NULL, 16);
945945
} else {
946946
*t++ = '\\';
947947
*t++ = *s;
@@ -962,7 +962,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
962962
Z_STRSIZE_P(zendlval)--;
963963
}
964964
}
965-
*t++ = (char) ZEND_STRTOL(octal_buf, NULL, 8);
965+
*t++ = (char) ZEND_STRTOI(octal_buf, NULL, 8);
966966
} else {
967967
*t++ = '\\';
968968
*t++ = *s;
@@ -2943,10 +2943,10 @@ int lex_scan(zval *zendlval TSRMLS_DC)
29432943
#line 1521 "Zend/zend_language_scanner.l"
29442944
{
29452945
if (yyleng < MAX_LENGTH_OF_ZEND_INT - 1) { /* Won't overflow */
2946-
Z_IVAL_P(zendlval) = ZEND_STRTOL(yytext, NULL, 0);
2946+
Z_IVAL_P(zendlval) = ZEND_STRTOI(yytext, NULL, 0);
29472947
} else {
29482948
errno = 0;
2949-
Z_IVAL_P(zendlval) = ZEND_STRTOL(yytext, NULL, 0);
2949+
Z_IVAL_P(zendlval) = ZEND_STRTOI(yytext, NULL, 0);
29502950
if (errno == ERANGE) { /* Overflow */
29512951
if (yytext[0] == '0') { /* octal overflow */
29522952
Z_DVAL_P(zendlval) = zend_oct_strtod(yytext, NULL);
@@ -3309,7 +3309,7 @@ int lex_scan(zval *zendlval TSRMLS_DC)
33093309
if (len == 0) {
33103310
Z_IVAL_P(zendlval) = 0;
33113311
} else {
3312-
Z_IVAL_P(zendlval) = ZEND_STRTOL(bin, NULL, 2);
3312+
Z_IVAL_P(zendlval) = ZEND_STRTOI(bin, NULL, 2);
33133313
}
33143314
zendlval->type = IS_INT;
33153315
return T_LNUMBER;
@@ -3345,7 +3345,7 @@ int lex_scan(zval *zendlval TSRMLS_DC)
33453345
if (len == 0) {
33463346
Z_IVAL_P(zendlval) = 0;
33473347
} else {
3348-
Z_IVAL_P(zendlval) = ZEND_STRTOL(hex, NULL, 16);
3348+
Z_IVAL_P(zendlval) = ZEND_STRTOI(hex, NULL, 16);
33493349
}
33503350
zendlval->type = IS_INT;
33513351
return T_LNUMBER;
@@ -7653,7 +7653,7 @@ int lex_scan(zval *zendlval TSRMLS_DC)
76537653
#line 1566 "Zend/zend_language_scanner.l"
76547654
{ /* Offset could be treated as a long */
76557655
if (yyleng < MAX_LENGTH_OF_ZEND_INT - 1 || (yyleng == MAX_LENGTH_OF_ZEND_INT - 1 && strcmp(yytext, int_min_digits) < 0)) {
7656-
ZVAL_INT(zendlval, ZEND_STRTOL(yytext, NULL, 10));
7656+
ZVAL_INT(zendlval, ZEND_STRTOI(yytext, NULL, 10));
76577657
} else {
76587658
ZVAL_STRINGL(zendlval, yytext, yyleng, 1);
76597659
}

‎Zend/zend_language_scanner.l

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
939939
hex_buf[1] = *(++s);
940940
Z_STRSIZE_P(zendlval)--;
941941
}
942-
*t++ = (char) ZEND_STRTOL(hex_buf, NULL, 16);
942+
*t++ = (char) ZEND_STRTOI(hex_buf, NULL, 16);
943943
} else {
944944
*t++ = '\\';
945945
*t++ = *s;
@@ -960,7 +960,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
960960
Z_STRSIZE_P(zendlval)--;
961961
}
962962
}
963-
*t++ = (char) ZEND_STRTOL(octal_buf, NULL, 8);
963+
*t++ = (char) ZEND_STRTOI(octal_buf, NULL, 8);
964964
} else {
965965
*t++ = '\\';
966966
*t++ = *s;
@@ -1508,7 +1508,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
15081508
if (len == 0) {
15091509
Z_IVAL_P(zendlval) = 0;
15101510
} else {
1511-
Z_IVAL_P(zendlval) = ZEND_STRTOL(bin, NULL, 2);
1511+
Z_IVAL_P(zendlval) = ZEND_STRTOI(bin, NULL, 2);
15121512
}
15131513
zendlval->type = IS_INT;
15141514
return T_LNUMBER;
@@ -1520,10 +1520,10 @@ NEWLINE ("\r"|"\n"|"\r\n")
15201520

15211521
<ST_IN_SCRIPTING>{LNUM} {
15221522
if (yyleng < MAX_LENGTH_OF_ZEND_INT - 1) { /* Won't overflow */
1523-
Z_IVAL_P(zendlval) = ZEND_STRTOL(yytext, NULL, 0);
1523+
Z_IVAL_P(zendlval) = ZEND_STRTOI(yytext, NULL, 0);
15241524
} else {
15251525
errno = 0;
1526-
Z_IVAL_P(zendlval) = ZEND_STRTOL(yytext, NULL, 0);
1526+
Z_IVAL_P(zendlval) = ZEND_STRTOI(yytext, NULL, 0);
15271527
if (errno == ERANGE) { /* Overflow */
15281528
if (yytext[0] == '0') { /* octal overflow */
15291529
Z_DVAL_P(zendlval) = zend_oct_strtod(yytext, NULL);
@@ -1553,7 +1553,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
15531553
if (len == 0) {
15541554
Z_IVAL_P(zendlval) = 0;
15551555
} else {
1556-
Z_IVAL_P(zendlval) = ZEND_STRTOL(hex, NULL, 16);
1556+
Z_IVAL_P(zendlval) = ZEND_STRTOI(hex, NULL, 16);
15571557
}
15581558
zendlval->type = IS_INT;
15591559
return T_LNUMBER;
@@ -1565,7 +1565,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
15651565

15661566
<ST_VAR_OFFSET>[0]|([1-9][0-9]*) { /* Offset could be treated as a long */
15671567
if (yyleng < MAX_LENGTH_OF_ZEND_INT - 1 || (yyleng == MAX_LENGTH_OF_ZEND_INT - 1 && strcmp(yytext, int_min_digits) < 0)) {
1568-
ZVAL_INT(zendlval, ZEND_STRTOL(yytext, NULL, 10));
1568+
ZVAL_INT(zendlval, ZEND_STRTOI(yytext, NULL, 10));
15691569
} else {
15701570
ZVAL_STRINGL(zendlval, yytext, yyleng, 1);
15711571
}

‎Zend/zend_operators.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ZEND_API int zend_atoi(const char *str, zend_size_t str_len) /* {{{ */
8686
if (!str_len) {
8787
str_len = strlen(str);
8888
}
89-
retval = ZEND_STRTOL(str, NULL, 0);
89+
retval = ZEND_STRTOI(str, NULL, 0);
9090
if (str_len>0) {
9191
switch (str[str_len-1]) {
9292
case 'g':
@@ -114,7 +114,7 @@ ZEND_API zend_int_t zend_atol(const char *str, zend_size_t str_len) /* {{{ */
114114
if (!str_len) {
115115
str_len = strlen(str);
116116
}
117-
retval = ZEND_STRTOL(str, NULL, 0);
117+
retval = ZEND_STRTOI(str, NULL, 0);
118118
if (str_len>0) {
119119
switch (str[str_len-1]) {
120120
case 'g':
@@ -263,7 +263,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
263263
Z_IVAL(holder) = zend_dval_to_ival(Z_DVAL_P(op)); \
264264
break; \
265265
case IS_STRING: \
266-
Z_IVAL(holder) = ZEND_STRTOL(Z_STRVAL_P(op), NULL, 10); \
266+
Z_IVAL(holder) = ZEND_STRTOI(Z_STRVAL_P(op), NULL, 10); \
267267
break; \
268268
case IS_ARRAY: \
269269
Z_IVAL(holder) = (zend_hash_num_elements(Z_ARRVAL_P(op))?1:0); \
@@ -390,7 +390,7 @@ ZEND_API void convert_to_int_base(zval *op, int base) /* {{{ */
390390
{
391391
char *strval = Z_STRVAL_P(op);
392392

393-
Z_IVAL_P(op) = ZEND_STRTOL(strval, NULL, base);
393+
Z_IVAL_P(op) = ZEND_STRTOI(strval, NULL, base);
394394
str_efree(strval);
395395
}
396396
break;

‎Zend/zend_operators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static inline zend_uchar is_numeric_string_ex(const char *str, zend_size_t lengt
254254
}
255255

256256
if (lval) {
257-
*lval = ZEND_STRTOL(str, NULL, base);
257+
*lval = ZEND_STRTOI(str, NULL, base);
258258
}
259259

260260
return IS_INT;

‎compat/PECL_PORTING

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ https://wiki.php.net/rfc/size_t_and_int64
7979
ZVAL_INT - replacement for ZVAL_LONG
8080
RETVAL_INT - RETVAL_LONG
8181
RETURN_INT - RETURN_LONG
82-
ZEND_STRTOL - portable strtol version
83-
ZEND_STRTOUL - portable strtoul version
82+
ZEND_STRTOI - portable strtol version
83+
ZEND_STRTOUI - portable strtoul version
8484
ZEND_ITOA - portable itoa version
8585
ZEND_ATOI - portable atol version
8686
ZEND_ABS - portable abs version

‎compat/compat.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ typedef struct stat zend_stat_t;
3838
# define Z_I(i) i
3939
# define Z_UI(i) i
4040
# define SIZEOF_ZEND_INT SIZEOF_LONG
41-
# define ZEND_STRTOL(s0, s1, base) strtol((s0), (s1), (base))
42-
# define ZEND_STRTOUL(s0, s1, base) strtoul((s0), (s1), (base))
41+
# define ZEND_STRTOI(s0, s1, base) strtol((s0), (s1), (base))
42+
# define ZEND_STRTOUI(s0, s1, base) strtoul((s0), (s1), (base))
4343
# ifdef PHP_WIN32
4444
# define ZEND_ITOA(i, s, len) _ltoa_s((i), (s), (len), 10)
4545
# define ZEND_ATOI(i, s) i = atol((s))
@@ -55,8 +55,8 @@ typedef struct stat zend_stat_t;
5555
# define ZEND_UINT_FMT "%lu"
5656
# define ZEND_INT_FMT_SPEC "ld"
5757
# define ZEND_UINT_FMT_SPEC "lu"
58-
# define ZEND_STRTOL_PTR strtol
59-
# define ZEND_STRTOUL_PTR strtoul
58+
# define ZEND_STRTOI_PTR strtol
59+
# define ZEND_STRTOUI_PTR strtoul
6060
# define ZEND_ABS abs
6161
# define zend_fseek fseek
6262
# define zend_ftell ftell

‎ext/json/JSON_parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ static void json_create_zval(zval **z, smart_str *buf, int type, php_int_t optio
328328
}
329329
}
330330

331-
ZVAL_INT(*z, ZEND_STRTOL(buf->c, NULL, 10));
331+
ZVAL_INT(*z, ZEND_STRTOI(buf->c, NULL, 10));
332332
}
333333
else if (type == IS_DOUBLE)
334334
{

‎ext/mysqlnd/mysqlnd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2097,11 +2097,11 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_server_version)(const MYSQLND_CONN_DATA *
20972097
return 0;
20982098
}
20992099

2100-
major = ZEND_STRTOL(p, &p, 10);
2100+
major = ZEND_STRTOI(p, &p, 10);
21012101
p += 1; /* consume the dot */
2102-
minor = ZEND_STRTOL(p, &p, 10);
2102+
minor = ZEND_STRTOI(p, &p, 10);
21032103
p += 1; /* consume the dot */
2104-
patch = ZEND_STRTOL(p, &p, 10);
2104+
patch = ZEND_STRTOI(p, &p, 10);
21052105

21062106
return (php_uint_t)(major * 10000L + (php_uint_t)(minor * 100L + patch));
21072107
}

‎ext/mysqlnd/mysqlnd_result_meta.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ mysqlnd_is_key_numeric(const char * key, size_t length, php_int_t *idx)
7474
}
7575
if (tmp==end && *tmp=='\0') { /* a numeric index */
7676
if (*key=='-') {
77-
*idx = ZEND_STRTOL(key, NULL, 10);
77+
*idx = ZEND_STRTOI(key, NULL, 10);
7878
if (*idx!=PHP_INT_MIN) {
7979
return TRUE;
8080
}
8181
} else {
82-
*idx = ZEND_STRTOL(key, NULL, 10);
82+
*idx = ZEND_STRTOI(key, NULL, 10);
8383
if (*idx!=PHP_INT_MAX) {
8484
return TRUE;
8585
}

‎ext/session/mod_files.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ PS_OPEN_FUNC(files)
272272

273273
if (argc > 1) {
274274
errno = 0;
275-
dirdepth = (size_t) ZEND_STRTOL(argv[0], NULL, 10);
275+
dirdepth = (size_t) ZEND_STRTOI(argv[0], NULL, 10);
276276
if (errno == ERANGE) {
277277
php_error(E_WARNING, "The first parameter in session.save_path is invalid");
278278
return FAILURE;
@@ -281,7 +281,7 @@ PS_OPEN_FUNC(files)
281281

282282
if (argc > 2) {
283283
errno = 0;
284-
filemode = ZEND_STRTOL(argv[1], NULL, 8);
284+
filemode = ZEND_STRTOI(argv[1], NULL, 8);
285285
if (errno == ERANGE || filemode < 0 || filemode > 07777) {
286286
php_error(E_WARNING, "The second parameter in session.save_path is invalid");
287287
return FAILURE;

‎ext/session/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ static PHP_INI_MH(OnUpdateHashFunc) /* {{{ */
720720
PS(hash_ops) = NULL;
721721
#endif
722722

723-
val = ZEND_STRTOL(new_value, &endptr, 10);
723+
val = ZEND_STRTOI(new_value, &endptr, 10);
724724
if (endptr && (*endptr == '\0')) {
725725
/* Numeric value */
726726
PS(hash_func) = val ? 1 : 0;

‎ext/standard/crypt_sha256.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b
372372
if (strncmp(salt, sha256_rounds_prefix, sizeof(sha256_rounds_prefix) - 1) == 0) {
373373
const char *num = salt + sizeof(sha256_rounds_prefix) - 1;
374374
char *endp;
375-
php_uint_t srounds = ZEND_STRTOUL(num, &endp, 10);
375+
php_uint_t srounds = ZEND_STRTOUI(num, &endp, 10);
376376
if (*endp == '$') {
377377
salt = endp + 1;
378378
rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));

‎ext/standard/crypt_sha512.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
405405
if (strncmp(salt, sha512_rounds_prefix, sizeof(sha512_rounds_prefix) - 1) == 0) {
406406
const char *num = salt + sizeof(sha512_rounds_prefix) - 1;
407407
char *endp;
408-
php_uint_t srounds = ZEND_STRTOUL(num, &endp, 10);
408+
php_uint_t srounds = ZEND_STRTOUI(num, &endp, 10);
409409

410410
if (*endp == '$') {
411411
salt = endp + 1;

‎ext/standard/formatted_print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ inline static int
324324
php_sprintf_getnumber(char *buffer, php_size_t *pos)
325325
{
326326
char *endptr;
327-
register php_int_t num = ZEND_STRTOL(&buffer[*pos], &endptr, 10);
327+
register php_int_t num = ZEND_STRTOI(&buffer[*pos], &endptr, 10);
328328
register php_size_t i = 0;
329329

330330
if (endptr != NULL) {

‎ext/standard/html.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ static inline int process_numeric_entity(const char **buf, unsigned *code_point)
792792
return FAILURE;
793793
}
794794

795-
code_l = ZEND_STRTOL(*buf, &endptr, hexadecimal ? 16 : 10);
795+
code_l = ZEND_STRTOI(*buf, &endptr, hexadecimal ? 16 : 10);
796796
/* we're guaranteed there were valid digits, so *endptr > buf */
797797
*buf = endptr;
798798

‎ext/standard/php_fopen_wrapper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa
190190
max_memory = PHP_STREAM_MAX_MEM;
191191
if (!strncasecmp(path, "/maxmemory:", 11)) {
192192
path += 11;
193-
max_memory = ZEND_STRTOL(path, NULL, 10);
193+
max_memory = ZEND_STRTOI(path, NULL, 10);
194194
if (max_memory < 0) {
195195
php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Max memory must be >= 0");
196196
return NULL;
@@ -303,7 +303,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa
303303
}
304304

305305
start = &path[3];
306-
fildes_ori = ZEND_STRTOL(start, &end, 10);
306+
fildes_ori = ZEND_STRTOI(start, &end, 10);
307307
if (end == start || *end != '\0') {
308308
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
309309
"php://fd/ stream must be specified in the form php://fd/<orig fd>");

0 commit comments

Comments
 (0)