diff options
author | Dmitry Stogov <dmitry@zend.com> | 2016-06-23 12:47:06 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-23 12:47:06 +0300 |
commit | adc95c511495f00cd1a90feff5fff7968e38fc4a (patch) | |
tree | 594019d7d287296c8bd12b47ff41e889f84aa7f9 /ext/standard/pack.c | |
parent | 4ac29543d6e70d6914e85d36f9b50e18968ebea6 (diff) | |
download | php-git-adc95c511495f00cd1a90feff5fff7968e38fc4a.tar.gz |
Fixed compilation warnings
Diffstat (limited to 'ext/standard/pack.c')
-rw-r--r-- | ext/standard/pack.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 1d353d1743..1252f4286f 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -92,7 +92,7 @@ static int little_endian_longlong_map[8]; */ static void php_pack(zval *val, size_t size, int *map, char *output) { - int i; + size_t i; char *v; convert_to_long_ex(val); @@ -112,13 +112,14 @@ static void php_pack(zval *val, size_t size, int *map, char *output) PHP_FUNCTION(pack) { zval *argv = NULL; - int num_args = 0, i; + int num_args = 0; + size_t i; int currentarg; char *format; size_t formatlen; char *formatcodes; int *formatargs; - int formatcount = 0; + size_t formatcount = 0; int outputpos = 0, outputsize = 0; zend_string *output; @@ -334,7 +335,7 @@ PHP_FUNCTION(pack) case 'a': case 'A': case 'Z': { - int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1); + size_t arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1); zend_string *str = zval_get_string(&argv[currentarg++]); @@ -356,7 +357,7 @@ PHP_FUNCTION(pack) char *v = ZSTR_VAL(str); outputpos--; - if(arg > ZSTR_LEN(str)) { + if ((size_t)arg > ZSTR_LEN(str)) { php_error_docref(NULL, E_WARNING, "Type %c: not enough characters in string", code); arg = ZSTR_LEN(str); } @@ -519,7 +520,7 @@ static zend_long php_unpack(char *data, size_t size, int issigned, int *map) { zend_long result; char *cresult = (char *) &result; - int i; + size_t i; result = issigned ? -1 : 0; @@ -726,7 +727,7 @@ PHP_FUNCTION(unpack) switch ((int) type) { case 'a': { /* a will not strip any trailing whitespace or null padding */ - size_t len = inputlen - inputpos; /* Remaining string */ + zend_long len = inputlen - inputpos; /* Remaining string */ /* If size was given take minimum of len and size */ if ((size >= 0) && (len > size)) { @@ -768,7 +769,7 @@ PHP_FUNCTION(unpack) case 'Z': { /* Z will strip everything after the first null character */ char pad = '\0'; - size_t s, + zend_long s, len = inputlen - inputpos; /* Remaining string */ /* If size was given take minimum of len and size */ @@ -792,11 +793,11 @@ PHP_FUNCTION(unpack) case 'h': case 'H': { - size_t len = (inputlen - inputpos) * 2; /* Remaining */ + zend_long len = (inputlen - inputpos) * 2; /* Remaining */ int nibbleshift = (type == 'h') ? 0 : 4; int first = 1; char *buf; - size_t ipos, opos; + zend_long ipos, opos; /* If size was given take minimum of len and size */ if (size >= 0 && len > (size * 2)) { |