cvs: php4 /ext/standard formatted_print.c

hholzgra Sun Jun 16 17:22:11 2002 EDT Modified files: /php4/ext/standard formatted_print.c Log: reverted patch depending on not yet commited work Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.48 php4/ext/standard/formatted_print.c:1.49 --- php4/ext/standard/formatted_print.c:1.48 Sun Jun 16 09:14:21 2002 +++ php4/ext/standard/formatted_print.c Sun Jun 16 17:22:10 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.48 2002/06/16 13:14:21 hholzgra Exp $ */ +/* $Id: formatted_print.c,v 1.49 2002/06/16 21:22:10 hholzgra Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -274,15 +274,6 @@ char *cvt; register int i = 0, j = 0; int sign, decpt; -#ifdef HAVE_LOCALECONV - char decimal_point; - TSRMLS_FETCH(); - - decimal_point = CG(decimal_point); -#else -#define decimal_point '.' -#endif - PRINTF_DEBUG(("sprintf: appenddouble(%x, %x, %x, %f, %d, '%c', %d, %c)\n", *buffer, pos, size, number, width, padding, alignment, fmt)); @@ -317,7 +308,7 @@ numbuf[i++] = '0'; if (precision > 0) { int k = precision; - numbuf[i++] = decimal_point; + numbuf[i++] = '.'; while ((decpt++ < 0) && k--) { numbuf[i++] = '0'; } @@ -326,12 +317,12 @@ while (decpt-- > 0) numbuf[i++] = cvt[j++]; if (precision > 0) - numbuf[i++] = decimal_point; + numbuf[i++] = '.'; } } else { numbuf[i++] = cvt[j++]; if (precision > 0) - numbuf[i++] = decimal_point; + numbuf[i++] = '.'; } while (cvt[j]) { @@ -345,9 +336,6 @@ } php_sprintf_appendstring(buffer, pos, size, numbuf, width, 0, padding, alignment, i, sign, 0); -#ifndef HAVE_LOCALECONV -#undef decimal_point -#endif } @@ -595,7 +583,7 @@ case 'e': case 'f': - /* XXX not done */ /* ??? WTF? 'g' missing or what? (hartmut) */ + /* XXX not done */ convert_to_double_ex(args[argnum]); php_sprintf_appenddouble(&result, &outpos, &size, Z_DVAL_PP(args[argnum]),