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/snprintf.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'main/snprintf.c')
| -rw-r--r-- | main/snprintf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/snprintf.c b/main/snprintf.c index 7a55034341..8f32f3977d 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -793,7 +793,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / 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; @@ -829,7 +829,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / 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; } /* @@ -874,7 +874,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / 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; } } @@ -923,7 +923,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / 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, &num_buf[NUM_BUF_SIZE], &s_len); @@ -965,7 +965,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / 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, &num_buf[NUM_BUF_SIZE], &s_len); |