mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 06:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source
This commit is contained in:
Arnaud Le Blanc 2013-01-13 15:47:12 +01:00
commit 718afb9acf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/spprintf.c
View File

@ -211,7 +211,7 @@ static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
double fp_num; double fp_num;
wide_int i_num = (wide_int) 0; 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 num_buf[NUM_BUF_SIZE];
char char_buf[2]; /* for printing %% and %<unknown> */ 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, s = ap_php_conv_p2(ui_num, 4, *fmt,
&num_buf[NUM_BUF_SIZE], &s_len); &num_buf[NUM_BUF_SIZE], &s_len);
FIX_PRECISION(adjust_precision, precision, s, 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 = *fmt; /* 'x' or 'X' */
*--s = '0'; *--s = '0';
s_len += 2; s_len += 2;