diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /main/spprintf.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'main/spprintf.c')
| -rw-r--r-- | main/spprintf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/spprintf.c b/main/spprintf.c index 5c0310fd9d..0194722418 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -407,7 +407,7 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt if (free_zcopy) { zvp = &zcopy; } - s_len = Z_STRSIZE_P(zvp); + s_len = Z_STRLEN_P(zvp); s = Z_STRVAL_P(zvp); if (adjust_precision && precision < s_len) { s_len = precision; @@ -443,7 +443,7 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt break; #endif case LM_PHP_INT_T: - i_num = (wide_int) va_arg(ap, php_uint_t); + i_num = (wide_int) va_arg(ap, zend_ulong); break; } /* @@ -488,7 +488,7 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt break; #endif case LM_PHP_INT_T: - i_num = (wide_int) va_arg(ap, php_int_t); + i_num = (wide_int) va_arg(ap, zend_long); break; } } @@ -536,7 +536,7 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt break; #endif case LM_PHP_INT_T: - ui_num = (u_wide_int) va_arg(ap, php_uint_t); + ui_num = (u_wide_int) va_arg(ap, zend_ulong); break; } s = ap_php_conv_p2(ui_num, 3, *fmt, @@ -579,7 +579,7 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt break; #endif case LM_PHP_INT_T: - ui_num = (u_wide_int) va_arg(ap, php_uint_t); + ui_num = (u_wide_int) va_arg(ap, zend_ulong); break; } s = ap_php_conv_p2(ui_num, 4, *fmt, |