diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
| commit | 16160386982a86e6ec7969c6c89707d38228f19e (patch) | |
| tree | 47052539a23ab7d6d2cf79392dd1e47de67bb2f1 /ext/zlib/zlib.c | |
| parent | 67e23f4be3c01a389043ee97b98d6bcc703d3557 (diff) | |
| download | php-git-16160386982a86e6ec7969c6c89707d38228f19e.tar.gz | |
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
Diffstat (limited to 'ext/zlib/zlib.c')
| -rw-r--r-- | ext/zlib/zlib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index d9d6be1638..af54d77181 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -673,7 +673,7 @@ static PHP_FUNCTION(name) \ } \ } \ if (level < -1 || level > 9) { \ - php_error_docref(NULL, E_WARNING, "compression level (%pd) must be within -1..9", level); \ + php_error_docref(NULL, E_WARNING, "compression level (" ZEND_LONG_FMT ") must be within -1..9", level); \ RETURN_FALSE; \ } \ switch (encoding) { \ @@ -702,7 +702,7 @@ static PHP_FUNCTION(name) \ return; \ } \ if (max_len < 0) { \ - php_error_docref(NULL, E_WARNING, "length (%pd) must be greater or equal zero", max_len); \ + php_error_docref(NULL, E_WARNING, "length (" ZEND_LONG_FMT ") must be greater or equal zero", max_len); \ RETURN_FALSE; \ } \ if (SUCCESS != php_zlib_decode(in_buf, in_len, &out_buf, &out_len, encoding, max_len)) { \ @@ -863,7 +863,7 @@ PHP_FUNCTION(inflate_init) window = zval_get_long(option_buffer); } if (window < 8 || window > 15) { - php_error_docref(NULL, E_WARNING, "zlib window size (lograithm) (%pd) must be within 8..15", window); + php_error_docref(NULL, E_WARNING, "zlib window size (lograithm) (" ZEND_LONG_FMT ") must be within 8..15", window); RETURN_FALSE; } @@ -1033,7 +1033,7 @@ PHP_FUNCTION(deflate_init) level = zval_get_long(option_buffer); } if (level < -1 || level > 9) { - php_error_docref(NULL, E_WARNING, "compression level (%pd) must be within -1..9", level); + php_error_docref(NULL, E_WARNING, "compression level (" ZEND_LONG_FMT ") must be within -1..9", level); RETURN_FALSE; } @@ -1041,7 +1041,7 @@ PHP_FUNCTION(deflate_init) memory = zval_get_long(option_buffer); } if (memory < 1 || memory > 9) { - php_error_docref(NULL, E_WARNING, "compression memory level (%pd) must be within 1..9", memory); + php_error_docref(NULL, E_WARNING, "compression memory level (" ZEND_LONG_FMT ") must be within 1..9", memory); RETURN_FALSE; } @@ -1049,7 +1049,7 @@ PHP_FUNCTION(deflate_init) window = zval_get_long(option_buffer); } if (window < 8 || window > 15) { - php_error_docref(NULL, E_WARNING, "zlib window size (logarithm) (%pd) must be within 8..15", window); + php_error_docref(NULL, E_WARNING, "zlib window size (logarithm) (" ZEND_LONG_FMT ") must be within 8..15", window); RETURN_FALSE; } |