summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Le Blanc <arnaud.lb@gmail.com>2013-01-13 15:45:15 +0100
committerArnaud Le Blanc <arnaud.lb@gmail.com>2013-01-13 15:45:15 +0100
commita06313fe5ab49b20bdafbae6b000bda8d9ca3176 (patch)
treeca8e5f69a44d2a710566b68484142cb0472f1b43
parent046ae2f77ca36366008690edc4b35ddd2c8f9fc7 (diff)
downloadphp-git-a06313fe5ab49b20bdafbae6b000bda8d9ca3176.tar.gz
fixed alternate form for 'x' and 'X' formats
same fix exists in original code: https://svn.apache.org/viewvc?view=revision&revision=1152309
-rw-r--r--main/spprintf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/spprintf.c b/main/spprintf.c
index bb401ab136..596e1ef456 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -211,7 +211,7 @@ static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
double fp_num;
wide_int i_num = (wide_int) 0;
- u_wide_int ui_num;
+ u_wide_int ui_num = (u_wide_int) 0;
char num_buf[NUM_BUF_SIZE];
char char_buf[2]; /* for printing %% and %<unknown> */
@@ -560,7 +560,7 @@ static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
s = ap_php_conv_p2(ui_num, 4, *fmt,
&num_buf[NUM_BUF_SIZE], &s_len);
FIX_PRECISION(adjust_precision, precision, s, s_len);
- if (alternate_form && i_num != 0) {
+ if (alternate_form && ui_num != 0) {
*--s = *fmt; /* 'x' or 'X' */
*--s = '0';
s_len += 2;