cvs: php4 /ext/standard formatted_print.c

coar Thu Jul 20 20:21:57 2000 EDT Modified files: /php4/ext/standard formatted_print.c Log: Undo numerical format regression introduced by the fix of the zero-precison %s formatting. Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.22 php4/ext/standard/formatted_print.c:1.23 --- php4/ext/standard/formatted_print.c:1.22 Tue Jul 18 09:34:30 2000 +++ php4/ext/standard/formatted_print.c Thu Jul 20 20:21:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.22 2000/07/18 16:34:30 coar Exp $ */ +/* $Id: formatted_print.c,v 1.23 2000/07/21 03:21:56 coar Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -196,7 +196,7 @@ inline static void php_sprintf_appendint(char **buffer, int *pos, int *size, int number, - int width, char padding, int alignment, int expprec) + int width, char padding, int alignment) { char numbuf[NUM_BUF_SIZE]; register unsigned int magn, nmagn, i = NUM_BUF_SIZE - 1, neg = 0; @@ -229,7 +229,7 @@ number, &numbuf[i], i)); php_sprintf_appendstring(buffer, pos, size, &numbuf[i], width, 0, padding, alignment, (NUM_BUF_SIZE - 1) - i, - neg, expprec); + neg, 0); } @@ -238,7 +238,7 @@ int *size, double number, int width, char padding, int alignment, int precision, - int adjust, char fmt, int expprec) + int adjust, char fmt) { char numbuf[NUM_BUF_SIZE]; char *cvt; @@ -290,7 +290,7 @@ width += (precision + 1); } php_sprintf_appendstring(buffer, pos, size, numbuf, width, 0, padding, - alignment, i, sign, expprec); + alignment, i, sign, 0); } @@ -493,7 +493,7 @@ convert_to_long_ex(args[currarg]); php_sprintf_appendint(&result, &outpos, &size, (*args[currarg])->value.lval, - width, padding, alignment, expprec); + width, padding, alignment); break; case 'e': @@ -504,7 +504,7 @@ (*args[currarg])->value.dval, width, padding, alignment, precision, adjusting, - format[inpos], expprec); + format[inpos]); break; case 'c':