10000 Return value from ZEND_ATOL · nikic/php-src@efbb219 · GitHub
[go: up one dir, main page]
Skip to content

Commit efbb219

Browse files
nikicnikic
committed
Return value from ZEND_ATOL
Instead of assigning it as part of the macro itself, which makes usage quite awkward.
1 parent e081db0 commit efbb219

File tree

10 files changed

+22
-44
lines changed

10 files changed

+22
-44
lines changed

‎Zend/zend.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,7 @@ static ZEND_INI_MH(OnUpdateAssertions) /* {{{ */
163163

164164
static ZEND_INI_MH(OnSetExceptionStringParamMaxLen) /* {{{ */
165165
{
166-
zend_long i;
167-
168-
ZEND_ATOL(i, ZSTR_VAL(new_value));
166+
zend_long i = ZEND_ATOL(ZSTR_VAL(new_value));
169167
if (i >= 0 && i <= 1000000) {
170168
EG(exception_string_param_max_len) = i;
171169
return SUCCESS;

‎Zend/zend_long.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ typedef int32_t zend_off_t;
6161
# define ZEND_ULONG_FMT_SPEC PRIu64
6262
# ifdef ZEND_WIN32
6363
# define ZEND_LTOA(i, s, len) _i64toa_s((i), (s), (len), 10)
64-
# define ZEND_ATOL(i, s) i = _atoi64((s))
64+
# define ZEND_ATOL(s) _atoi64((s))
6565
# define ZEND_STRTOL(s0, s1, base) _strtoi64((s0), (s1), (base))
6666
# define ZEND_STRTOUL(s0, s1, base) _strtoui64((s0), (s1), (base))
6767
# define ZEND_STRTOL_PTR _strtoi64
@@ -73,7 +73,7 @@ typedef int32_t zend_off_t;
7373
int st = snprintf((s), (len), ZEND_LONG_FMT, (i)); \
7474
(s)[st] = '\0'; \
7575
} while (0)
76-
# define ZEND_ATOL(i, s) (i) = atoll((s))
76+
# define ZEND_ATOL(s) atoll((s))
7777
# define ZEND_STRTOL(s0, s1, base) strtoll((s0), (s1), (base))
7878
# define ZEND_STRTOUL(s0, s1, base) strtoull((s0), (s1), (base))
7979
# define ZEND_STRTOL_PTR strtoll
@@ -90,14 +90,14 @@ typedef int32_t zend_off_t;
9090
# define ZEND_ULONG_FMT_SPEC PRIu32
9191
# ifdef ZEND_WIN32
9292
# define ZEND_LTOA(i, s, len) _ltoa_s((i), (s), (len), 10)
93-
# define ZEND_ATOL(i, s) i = atol((s))
93+
# define ZEND_ATOL(s) atol((s))
9494
# else
9595
# define ZEND_LTOA(i, s, len) \
9696
do { \
9797
int st = snprintf((s), (len), ZEND_LONG_FMT, (i)); \
9898
(s)[st] = '\0'; \
9999
} while (0)
100-
# define ZEND_ATOL(i, s) (i) = atol((s))
100+
# define ZEND_ATOL(s) atol((s))
101101
# endif
102102
# define ZEND_STRTOL_PTR strtol
103103
# define ZEND_STRTOUL_PTR strtoul

‎ext/ftp/ftp.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,8 +1108,6 @@ ftp_append(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *i
11081108
zend_long
11091109
ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len)
11101110
{
1111-
zend_long res;
1112-
11131111
if (ftp == NULL) {
11141112
return -1;
11151113
}
@@ -1122,8 +1120,7 @@ ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len)
11221120
if (!ftp_getresp(ftp) || ftp->resp != 213) {
11231121
return -1;
11241122
}
1125-
ZEND_ATOL(res, ftp->inbuf);
1126-
return res;
1123+
return ZEND_ATOL(ftp->inbuf);
11271124
}
11281125
/* }}} */
11291126

‎ext/mysqlnd/php_mysqlnd.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ static PHP_GINIT_FUNCTION(mysqlnd)
157157
/* {{{ PHP_INI_MH */
158158
static PHP_INI_MH(OnUpdateNetCmdBufferSize)
159159
{
160-
zend_long long_value;
161-
162-
ZEND_ATOL(long_value, ZSTR_VAL(new_value));
160+
zend_long long_value = ZEND_ATOL(ZSTR_VAL(new_value));
163161
if (long_value < MYSQLND_NET_CMD_BUFFER_MIN_SIZE) {
164162
return FAILURE;
165163
}

‎ext/pdo_pgsql/pgsql_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ static zend_long pgsql_handle_doer(pdo_dbh_t *dbh, const zend_string *sql)
308308
}
309309
H->pgoid = PQoidValue(res);
310310
if (qs == PGRES_COMMAND_OK) {
311-
ZEND_ATOL(ret, PQcmdTuples(res));
311+
ret = ZEND_ATOL(PQcmdTuples(res));
312312
} else {
313313
ret = Z_L(0);
314314
}

‎ext/pdo_pgsql/pgsql_statement.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt)
246246
}
247247

248248
if (status == PGRES_COMMAND_OK) {
249-
ZEND_ATOL(stmt->row_count, PQcmdTuples(S->result));
249+
stmt->row_count = ZEND_ATOL(PQcmdTuples(S->result));
250250
H->pgoid = PQoidValue(S->result);
251251
} else {
252252
stmt->row_count = (zend_long)PQntuples(S->result);
@@ -272,14 +272,14 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
272272
/* decode name from $1, $2 into 0, 1 etc. */
273273
if (param->name) {
274274
if (ZSTR_VAL(param->name)[0] == '$') {
275-
ZEND_ATOL(param->paramno, ZSTR_VAL(param->name) + 1);
275+
param->paramno = ZEND_ATOL(ZSTR_VAL(param->name) + 1);
276276
} else {
277277
/* resolve parameter name to rewritten name */
278278
zend_string *namevar;
279279

280280
if (stmt->bound_param_map && (namevar = zend_hash_find_ptr(stmt->bound_param_map,
281281
param->name)) != NULL) {
282-
ZEND_ATOL(param->paramno, ZSTR_VAL(namevar) + 1);
282+
param->paramno = ZEND_ATOL(ZSTR_VAL(namevar) + 1);
283283
param->paramno--;
284284
} else {
285285
pdo_pgsql_error_stmt_msg(stmt, 0, "HY093", ZSTR_VAL(param->name));
@@ -505,12 +505,8 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *result, enum pd
505505
#if SIZEOF_ZEND_LONG >= 8
506506
case INT8OID:
507507
#endif
508-
{
509-
zend_long intval;
510-
ZEND_ATOL(intval, ptr);
511-
ZVAL_LONG(result, intval);
508+
ZVAL_LONG(result, ZEND_ATOL(ptr));
512509
break;
513-
}
514510

515511
case OIDOID: {
516512
char *end_ptr;

‎main/fastcgi.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -511,21 +511,16 @@ int fcgi_init(void)
511511

512512
str = getenv("_FCGI_SHUTDOWN_EVENT_");
513513
if (str != NULL) {
514-
zend_long ev;
515-
HANDLE shutdown_event;
516-
517-
ZEND_ATOL(ev, str);
518-
shutdown_event = (HANDLE) ev;
514+
zend_long ev = ZEND_ATOL(str);
515+
HANDLE shutdown_event = (HANDLE) ev;
519516
if (!CreateThread(NULL, 0, fcgi_shutdown_thread,
520517
shutdown_event, 0, NULL)) {
521518
return -1;
522519
}
523520
}
524521
str = getenv("_FCGI_MUTEX_");
525522
if (str != NULL) {
526-
zend_long mt;
527-
ZEND_ATOL(mt, str);
528-
fcgi_accept_mutex = (HANDLE) mt;
523+
fcgi_accept_mutex = (HANDLE) ZEND_ATOL(str);
529524
}
530525
return is_fastcgi = 1;
531526
} else {

‎main/main.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,7 @@ static PHP_INI_MH(OnSetFacility)
236236
/* {{{ PHP_INI_MH */
237237
static PHP_INI_MH(OnSetPrecision)
238238
{
239-
zend_long i;
240-
241-
ZEND_ATOL(i, ZSTR_VAL(new_value));
239+
zend_long i = ZEND_ATOL(ZSTR_VAL(new_value));
242240
if (i >= -1) {
243241
EG(precision) = i;
244242
return SUCCESS;
@@ -251,9 +249,7 @@ static PHP_INI_MH(OnSetPrecision)
251249
/* {{{ PHP_INI_MH */
252250
static PHP_INI_MH(OnSetSerializePrecision)
253251
{
254-
zend_long i;
255-
256-
ZEND_ATOL(i, ZSTR_VAL(new_value));
252+
zend_long i = ZEND_ATOL(ZSTR_VAL(new_value));
257253
if (i >= -1) {
258254
PG(serialize_precision) = i;
259255
return SUCCESS;
@@ -402,11 +398,11 @@ static PHP_INI_MH(OnUpdateTimeout)
402398
{
403399
if (stage==PHP_INI_STAGE_STARTUP) {
404400
/* Don't set a timeout on startup, only per-request */
405-
ZEND_ATOL(EG(timeout_seconds), ZSTR_VAL(new_value));
401+
EG(timeout_seconds) = ZEND_ATOL(ZSTR_VAL(new_value));
406402
return SUCCESS;
407403
}
408404
zend_unset_timeout();
409-
ZEND_ATOL(EG(timeout_seconds), ZSTR_VAL(new_value));
405+
EG(timeout_seconds) = ZEND_ATOL(ZSTR_VAL(new_value));
410406
if (stage != PHP_INI_STAGE_DEACTIVATE) {
411407
/*
412408
* If we're restoring INI values, we shouldn't reset the timer.
@@ -423,8 +419,6 @@ static PHP_INI_MH(OnUpdateTimeout)
423419
/* {{{ php_get_display_errors_mode() helper function */
424420
static zend_uchar php_get_display_errors_mode(zend_string *value)
425421
{
426-
zend_uchar mode;
427-
428422
if (!value) {
429423
return PHP_DISPLAY_ERRORS_STDOUT;
430424
}
@@ -446,7 +440,7 @@ static zend_uchar php_get_display_errors_mode(zend_string *value)
446440
return PHP_DISPLAY_ERRORS_STDOUT;
447441
}
448442

449-
ZEND_ATOL(mode, ZSTR_VAL(value));
443+
zend_uchar mode = ZEND_ATOL(ZSTR_VAL(value));
450444
if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) {
451445
return PHP_DISPLAY_ERRORS_STDOUT;
452446
}

‎sapi/apache2handler/sapi_apache2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ static int php_apache_request_ctor(request_rec *r, php_struct *ctx)
519519

520520
content_length = (char *) apr_table_get(r->headers_in, "Content-Length");
521521
if (content_length) {
522-
ZEND_ATOL(SG(request_info).content_length, content_length);
522+
SG(request_info).content_length = ZEND_ATOL(content_length);
523523
} else {
524524
SG(request_info).content_length = 0;
525525
}

‎sapi/cli/php_cli_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2382,7 +2382,7 @@ static void php_cli_server_startup_workers() {
23822382
}
23832383

23842384
#if HAVE_FORK
2385-
ZEND_ATOL(php_cli_server_workers_max, workers);
2385+
php_cli_server_workers_max = ZEND_ATOL(workers);
23862386
if (php_cli_server_workers_max > 1) {
23872387
zend_long php_cli_server_worker;
23882388

0 commit comments

Comments
 (0)
0