From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Sun, 16 Jun 2002 21:22:10 +0000 (+0000)
Subject: reverted patch depending on not yet commited work
X-Git-Tag: php-4.3.0dev_zend2_alpha2~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0170e42763f31dd6735e6e70a6c7b01b7dc3d6ac;p=php

reverted patch depending on not yet commited work
---

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 2e55bbc884..7a11b3a5f0 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -274,15 +274,6 @@ php_sprintf_appenddouble(char **buffer, int *pos,
 	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 @@ php_sprintf_appenddouble(char **buffer, int *pos,
 			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 @@ php_sprintf_appenddouble(char **buffer, int *pos,
 			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_appenddouble(char **buffer, int *pos,
 	}
 	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 @@ php_formatted_print(int ht, int *len, int use_array TSRMLS_DC)
 
 				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]),