diff options
Diffstat (limited to 'main/snprintf.c')
| -rw-r--r-- | main/snprintf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/main/snprintf.c b/main/snprintf.c index fef2b95e7a..5990e3df91 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #define _GNU_SOURCE #include "php.h" @@ -487,9 +485,9 @@ PHPAPI char * ap_php_conv_p2(register u_wide_int num, register int nbits, char f { register int mask = (1 << nbits) - 1; register char *p = buf_end; - static char low_digits[] = "0123456789abcdef"; - static char upper_digits[] = "0123456789ABCDEF"; - register char *digits = (format == 'X') ? upper_digits : low_digits; + static const char low_digits[] = "0123456789abcdef"; + static const char upper_digits[] = "0123456789ABCDEF"; + register const char *digits = (format == 'X') ? upper_digits : low_digits; do { *--p = digits[num & mask]; @@ -1214,7 +1212,7 @@ fmt_error: if (adjust_width && adjust == LEFT && (size_t)min_width > s_len) PAD((size_t)min_width, s_len, pad_char); if (free_zcopy) { - zval_dtor(&zcopy); + zval_ptr_dtor_str(&zcopy); } } skip_output: |