mirror of
https://github.com/php/php-src.git
synced 2025-01-26 13:44:22 +08:00
Merge branch 'PHP-5.4' into PHP-5.5
This commit is contained in:
commit
718afb9acf
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user