diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-14 14:02:19 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-14 14:45:53 +0100 |
| commit | c9357f82d3882eb3c7cb9f63dbc98d354fb20739 (patch) | |
| tree | e4733ea1e1f5d866ef8ba6b63eb93b013d95c348 /ext/standard/var.c | |
| parent | 59833783641622160903d56c0aa522db01b59f4c (diff) | |
| download | php-git-c9357f82d3882eb3c7cb9f63dbc98d354fb20739.tar.gz | |
Format string fixes
Conflicts:
ext/pgsql/pgsql.c
Diffstat (limited to 'ext/standard/var.c')
| -rw-r--r-- | ext/standard/var.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index 61a7179dbb..fcee7a9cc6 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -108,7 +108,7 @@ again: php_printf("%sfloat(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_P(struc)); break; case IS_STRING: - php_printf("%sstring(%d) \"", COMMON, Z_STRLEN_P(struc)); + php_printf("%sstring(%zd) \"", COMMON, Z_STRLEN_P(struc)); PHPWRITE(Z_STRVAL_P(struc), Z_STRLEN_P(struc)); PUTS("\"\n"); break; @@ -278,7 +278,7 @@ again: php_printf("%sfloat(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_P(struc)); break; case IS_STRING: - php_printf("%sstring(%d) \"", COMMON, Z_STRLEN_P(struc)); + php_printf("%sstring(%zd) \"", COMMON, Z_STRLEN_P(struc)); PHPWRITE(Z_STRVAL_P(struc), Z_STRLEN_P(struc)); php_printf("\" refcount(%u)\n", Z_REFCOUNTED_P(struc) ? Z_REFCOUNT_P(struc) : 1); break; @@ -336,7 +336,7 @@ again: break; case IS_RESOURCE: { const char *type_name = zend_rsrc_list_get_rsrc_type(Z_RES_P(struc)); - php_printf("%sresource(" ZEND_LONG_FMT ") of type (%s) refcount(%u)\n", COMMON, Z_RES_P(struc)->handle, type_name ? type_name : "Unknown", Z_REFCOUNT_P(struc)); + php_printf("%sresource(%d) of type (%s) refcount(%u)\n", COMMON, Z_RES_P(struc)->handle, type_name ? type_name : "Unknown", Z_REFCOUNT_P(struc)); break; } case IS_REFERENCE: @@ -1045,7 +1045,8 @@ PHP_FUNCTION(unserialize) } zval_ptr_dtor(return_value); if (!EG(exception)) { - php_error_docref(NULL, E_NOTICE, "Error at offset " ZEND_LONG_FMT " of %d bytes", (zend_long)((char*)p - buf), buf_len); + php_error_docref(NULL, E_NOTICE, "Error at offset " ZEND_LONG_FMT " of %zd bytes", + (zend_long)((char*)p - buf), buf_len); } RETURN_FALSE; } |