com php-src: move zend_ato*() to size_t and rem ove casts: Zend/zend.c Zend/zend_ini.c Zend/zen d_operators.c Zend/zend_operators.h ext/session/ses
sion.c ext/standard/basic_functions.c main/main.c
| From: | Anatol Belski | Date: | Fri, 28 Jul 2017 12:59:31 +0000 |
| Subject: | com php-src: move zend_ato*() to size_t and rem ove casts: Zend/zend.c Zend/zend_ini.c Zend/zen d_operators.c Zend/zend_operators.h ext/session/ses sion.c ext/standard/basic_functions.c main/main.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98854@lists.php.net to get a copy of this message | ||
Commit: 0d1eeeb68dd692e3905f21a7a11fe04710d9313e
Author: Anatol Belski <ab@php.net> Fri, 28 Jul 2017 14:54:01 +0200
Parents: 44bbae99f8cf582e58f927dd2d8e724a874f9919
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d1eeeb68dd692e3905f21a7a11fe04710d9313e
Log:
move zend_ato*() to size_t and remove casts
Changed paths:
M Zend/zend.c
M Zend/zend_ini.c
M Zend/zend_operators.c
M Zend/zend_operators.h
M ext/session/session.c
M ext/standard/basic_functions.c
M main/main.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index f9a0441..0fd54c8 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -130,7 +130,7 @@ static ZEND_INI_MH(OnUpdateAssertions) /* {{{ */
p = (zend_long *) (base+(size_t) mh_arg1);
- val = zend_atol(ZSTR_VAL(new_value), (int)ZSTR_LEN(new_value));
+ val = zend_atol(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
if (stage != ZEND_INI_STAGE_STARTUP &&
stage != ZEND_INI_STAGE_SHUTDOWN &&
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 54ee149..b9212d6 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -658,7 +658,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */
p = (zend_long *) (base+(size_t) mh_arg1);
- *p = zend_atol(ZSTR_VAL(new_value), (int)ZSTR_LEN(new_value));
+ *p = zend_atol(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
return SUCCESS;
}
/* }}} */
@@ -674,7 +674,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */
base = (char *) ts_resource(*((int *) mh_arg2));
#endif
- tmp = zend_atol(ZSTR_VAL(new_value), (int)ZSTR_LEN(new_value));
+ tmp = zend_atol(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
if (tmp < 0) {
return FAILURE;
}
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index ffc4dcc..2008575 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -80,12 +80,12 @@ static const unsigned char tolower_map[256] = {
zend_binary_strncasecmp
*/
-ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, int str_len) /* {{{ */
+ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, size_t str_len) /* {{{ */
{
int retval;
if (!str_len) {
- str_len = (int)strlen(str);
+ str_len = strlen(str);
}
retval = ZEND_STRTOL(str, NULL, 0);
if (str_len>0) {
@@ -108,12 +108,12 @@ ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, int str_len) /* {{{ */
}
/* }}} */
-ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, int str_len) /* {{{ */
+ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, size_t str_len) /* {{{ */
{
zend_long retval;
if (!str_len) {
- str_len = (int)strlen(str);
+ str_len = strlen(str);
}
retval = ZEND_STRTOL(str, NULL, 0);
if (str_len>0) {
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 9c2df28..b2f5378 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -366,8 +366,8 @@ ZEND_API int ZEND_FASTCALL zend_compare_symbol_tables(HashTable *ht1, HashTable
ZEND_API int ZEND_FASTCALL zend_compare_arrays(zval *a1, zval *a2);
ZEND_API int ZEND_FASTCALL zend_compare_objects(zval *o1, zval *o2);
-ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, int str_len);
-ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, int str_len);
+ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, size_t str_len);
+ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, size_t str_len);
ZEND_API void ZEND_FASTCALL zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
diff --git a/ext/session/session.c b/ext/session/session.c
index 2822e6c..a264280 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -770,7 +770,7 @@ static PHP_INI_MH(OnUpdateLazyWrite) /* {{{ */
static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */
{
int tmp;
- tmp = zend_atoi(ZSTR_VAL(new_value), (int)ZSTR_LEN(new_value));
+ tmp = zend_atoi(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
if(tmp < 0) {
php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be greater than or
equal to zero");
return FAILURE;
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 383e988..949f8ad 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5917,7 +5917,7 @@ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int
cal
}
if (!(Z_STRLEN_P(arg1) > 1 && Z_STRVAL_P(arg1)[0] == '0') &&
is_numeric_string(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), NULL, NULL, 0) == IS_LONG) {
- zend_ulong key = (zend_ulong) zend_atol(Z_STRVAL_P(arg1), (int)Z_STRLEN_P(arg1));
+ zend_ulong key = (zend_ulong) zend_atol(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1));
if ((find_hash = zend_hash_index_find(Z_ARRVAL_P(arr), key)) == NULL) {
array_init(&hash);
find_hash = zend_hash_index_update(Z_ARRVAL_P(arr), key, &hash);
diff --git a/main/main.c b/main/main.c
index 360082f..df95626 100644
--- a/main/main.c
+++ b/main/main.c
@@ -157,7 +157,7 @@ static PHP_INI_MH(OnSetSerializePrecision)
static PHP_INI_MH(OnChangeMemoryLimit)
{
if (new_value) {
- PG(memory_limit) = zend_atol(ZSTR_VAL(new_value), (int)ZSTR_LEN(new_value));
+ PG(memory_limit) = zend_atol(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
} else {
PG(memory_limit) = 1<<30; /* effectively, no limit */
}