cvs: ZendEngine2(PHP_5_0) / zend_highlight.c

iliaa           Tue Aug 10 18:16:50 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /ZendEngine2        zend_highlight.c 
  Log:
  MFH: Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then
  returning the value).
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_highlight.c?r1=1.43&r2=1.43.2.1&ty=u
Index: ZendEngine2/zend_highlight.c
diff -u ZendEngine2/zend_highlight.c:1.43 ZendEngine2/zend_highlight.c:1.43.2.1
--- ZendEngine2/zend_highlight.c:1.43   Wed Feb 25 09:14:47 2004
+++ ZendEngine2/zend_highlight.c        Tue Aug 10 18:16:50 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_highlight.c,v 1.43 2004/02/25 14:14:47 derick Exp $ */
+/* $Id: zend_highlight.c,v 1.43.2.1 2004/08/10 22:16:50 iliaa Exp $ */
 
 #include "zend.h"
 #include "zend_language_parser.h"
@@ -203,7 +203,7 @@
                switch (token_type) {
                        case T_WHITESPACE:
                                if (!prev_space) {
-                                       putchar(' ');
+                                       zend_write(" ", sizeof(" ") - 1);
                                        prev_space = 1;
                                }
                                                /* lack of break; is 
intentional */
@@ -215,9 +215,9 @@
                        case T_END_HEREDOC: {
                                        char *ptr = LANG_SCNG(yy_text);
 
-                                       fwrite(ptr, LANG_SCNG(yy_leng) - 1, 1, 
stdout);
+                                       zend_write(ptr, LANG_SCNG(yy_leng) - 1);
                                        /* The ensure that we only write one ; 
and that it followed by the required newline */
-                                       putchar('\n');
+                                       zend_write("\n", sizeof("\n") - 1);
                                        if (ptr[LANG_SCNG(yy_leng) - 1] == ';') 
{
                                                lex_scan(&token TSRMLS_CC);
                                        }
@@ -226,7 +226,7 @@
                                break;
                        
                        default:
-                               fwrite(LANG_SCNG(yy_text), LANG_SCNG(yy_leng), 
1, stdout);
+                               zend_write(LANG_SCNG(yy_text), 
LANG_SCNG(yy_leng));
                                break;
                }
 

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