[PHP-CVS] cvs: php-src /ext/standard formatted_print.c

[Andrei Zmievski]

andrei          Wed Dec 20 18:33:27 2006 UTC

  Modified files:              
    /php-src/ext/standard       formatted_print.c 
  Log:
  Align Unicode and binary versions of formatted printing.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.92&r2=1.93&diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.92 
php-src/ext/standard/formatted_print.c:1.93
--- php-src/ext/standard/formatted_print.c:1.92 Tue Dec 19 18:41:40 2006
+++ php-src/ext/standard/formatted_print.c      Wed Dec 20 18:33:27 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: formatted_print.c,v 1.92 2006/12/19 18:41:40 andrei Exp $ */
+/* $Id: formatted_print.c,v 1.93 2006/12/20 18:33:27 andrei Exp $ */
 
 #include <math.h>                              /* modf() */
 #include "php.h"
@@ -431,7 +431,7 @@
                                                 TSRMLS_DC)
 {
        char num_buf[NUM_BUF_SIZE];
-       char *s = NULL, *q, s_fmt;
+       char *s = NULL, s_fmt;
        UChar *uni_s;
        int s_len = 0, is_negative = 0;
 #ifdef HAVE_LOCALE_H
@@ -506,7 +506,6 @@
                                s = num_buf;
                                s_len++;
                        }
-                       s[s_len] = '\0';
                        break;
 
                case 0x67 /* 'g' */:
@@ -530,10 +529,6 @@
                        }
 
                        s_len = strlen(s);
-
-                       if (fmt == 0x47 /* 'G' */ && (q = strchr(s, 'e')) != 
NULL) {
-                               *q = 'E';
-                       }
                        break;
        }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php