com php-src: Kill compiler warnings in ext/standard: ext/standard/array.c ext/standard/basic_functions.c ext/standard/browscap.c ext/standard/dir.c
ext/standard/dl.c ext/standard/ip tc.c ext/standard/math.c ext/standard/url_scanner_e x.c ext/standard/url_scanner_ex.re ext/standard/var
_unserializer.c ext/standard/var_unserializer.re

From: Date: Wed, 23 Aug 2017 23:36:14 +0000
Subject: com php-src: Kill compiler warnings in ext/standard: ext/standard/array.c ext/standard/basic_functions.c ext/standard/browscap.c ext/standard/dir.c
ext/standard/dl.c ext/standard/ip tc.c ext/standard/math.c ext/standard/url_scanner_e x.c ext/standard/url_scanner_ex.re ext/standard/var
_unserializer.c ext/standard/var_unserializer.re
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99135@lists.php.net to get a copy of this message
Commit: 4fbff82c1079f2c48c769c94f0d9269be7508a59 Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 24 Aug 2017 01:36:14 +0200 Parents: 2a965bbd002617e86a48bdf84af89044b2c4a181 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4fbff82c1079f2c48c769c94f0d9269be7508a59 Log: Kill compiler warnings in ext/standard Changed paths: M ext/standard/array.c M ext/standard/basic_functions.c M ext/standard/browscap.c M ext/standard/dir.c M ext/standard/dl.c M ext/standard/iptc.c M ext/standard/math.c M ext/standard/url_scanner_ex.c M ext/standard/url_scanner_ex.re M ext/standard/var_unserializer.c M ext/standard/var_unserializer.re Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 9ddbf1f..4bbd597 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2899,7 +2899,7 @@ long_str: goto err; } - lstep = step; + lstep = (zend_ulong)step; Z_TYPE_INFO(tmp) = IS_LONG; if (low > high) { /* Negative steps */ @@ -3992,7 +3992,7 @@ PHP_FUNCTION(array_keys) if (HT_IS_PACKED(arrval) && HT_IS_WITHOUT_HOLES(arrval)) { /* Optimistic case: range(0..n-1) for vector-like packed array */ ZVAL_LONG(&new_val, 0); - for (; Z_LVAL(new_val) < elem_count; ++Z_LVAL(new_val)) { + for (; (zend_ulong)Z_LVAL(new_val) < elem_count; ++Z_LVAL(new_val)) { ZEND_HASH_FILL_ADD(&new_val); } } else { @@ -5738,7 +5738,7 @@ PHP_FUNCTION(array_rand) if (num_req == 1) { HashTable *ht = Z_ARRVAL_P(input); - if (num_avail < ht->nNumUsed - (ht->nNumUsed>>1)) { + if ((uint32_t)num_avail < ht->nNumUsed - (ht->nNumUsed>>1)) { /* If less than 1/2 of elements are used, don't sample. Instead search for a * specific offset using linear scan. */ zend_long i = 0, randval = php_mt_rand_range(0, num_avail - 1); diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 76fc2ef..e4f692b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4149,7 +4149,7 @@ PHP_FUNCTION(putenv) pe.key_len = (int)strlen(pe.key); #ifdef PHP_WIN32 if (equals) { - if (pe.key_len < setting_len - 1) { + if ((size_t)pe.key_len < setting_len - 1) { value = p + 1; } else { /* empty string*/ diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 9967031..1b264f1 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -101,7 +101,7 @@ static uint8_t browscap_compute_prefix_len(zend_string *pattern) { break; } } - return MIN(i, UINT8_MAX); + return (uint8_t)MIN(i, UINT8_MAX); } static size_t browscap_compute_contains( @@ -119,7 +119,7 @@ static size_t browscap_compute_contains( } } } - *contains_start = i; + *contains_start = (uint16_t)i; /* Find first placeholder character after that */ for (; i < ZSTR_LEN(pattern); i++) { @@ -127,7 +127,7 @@ static size_t browscap_compute_contains( break; } } - *contains_len = MIN(i - *contains_start, UINT8_MAX); + *contains_len = (uint8_t)MIN(i - *contains_start, UINT8_MAX); return i; } diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 3cbc7cc..cc5c6d4 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -511,7 +511,7 @@ no_results: } array_init(return_value); - for (n = 0; n < globbuf.gl_pathc; n++) { + for (n = 0; n < (size_t)globbuf.gl_pathc; n++) { if (PG(open_basedir) && *PG(open_basedir)) { if (php_check_open_basedir_ex(globbuf.gl_pathv[n], 0)) { basedir_limit = 1; diff --git a/ext/standard/dl.c b/ext/standard/dl.c index f740792..5459eaa 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -110,7 +110,7 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now) char *libpath; zend_module_entry *module_entry; zend_module_entry *(*get_module)(void); - int error_type, slash_suffix = NULL; + int error_type, slash_suffix; char *extension_dir; char *err1, *err2; diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index e92e721..797e2a2 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc..c @@ -275,7 +275,7 @@ PHP_FUNCTION(iptcembed) iptcdata_len++; /* make the length even */ } - psheader[ 2 ] = (iptcdata_len+28)>>8; + psheader[ 2 ] = (char) (iptcdata_len+28)>>8; psheader[ 3 ] = (iptcdata_len+28)&0xff; for (inx = 0; inx < 28; inx++) { diff --git a/ext/standard/math.c b/ext/standard/math.c index 6f7bede..8285ede 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -1193,7 +1193,7 @@ PHPAPI zend_string *_php_math_number_format_ex(double d, int dec, char *dec_poin * we requested due to internal buffer limitations */ if (dec) { size_t declen = (dp ? s - dp : 0); - size_t topad = dec > declen ? dec - declen : 0; + size_t topad = (size_t)dec > declen ? dec - declen : 0; /* pad with '0's */ while (topad--) { diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 3d8aa98..2698b96 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1317,7 +1317,7 @@ static inline int php_url_scanner_reset_var_impl(zend_string *name, int encode, } /* Check preceeding separator */ if (!sep_removed - && start - PG(arg_separator).output >= separator_len + && (size_t)(start - PG(arg_separator).output) >= separator_len && !memcmp(start - separator_len, PG(arg_separator).output, separator_len)) { start -= separator_len; } diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index beb01c4..a06e8f2 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -902,7 +902,7 @@ static inline int php_url_scanner_reset_var_impl(zend_string *name, int encode, } /* Check preceeding separator */ if (!sep_removed - && start - PG(arg_separator).output >= separator_len + && (size_t)(start - PG(arg_separator).output) >= separator_len && !memcmp(start - separator_len, PG(arg_separator).output, separator_len)) { start -= separator_len; } diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 2c5ea75..619808f 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -579,7 +579,7 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements) && zend_hash_str_exists(&Z_OBJCE_P(rval)->function_table, "__wakeup", sizeof("__wakeup")-1); ht = Z_OBJPROP_P(rval); - if (elements >= HT_MAX_SIZE - zend_hash_num_elements(ht)) { + if (elements >= (zend_long)(HT_MAX_SIZE - zend_hash_num_elements(ht))) { return 0; } diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index de0db39..ce55e9a 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -583,7 +583,7 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements) && zend_hash_str_exists(&Z_OBJCE_P(rval)->function_table, "__wakeup", sizeof("__wakeup")-1); ht = Z_OBJPROP_P(rval); - if (elements >= HT_MAX_SIZE - zend_hash_num_elements(ht)) { + if (elements >= (zend_long)(HT_MAX_SIZE - zend_hash_num_elements(ht))) { return 0; }

« previous php.cvs (#99135) next »