cvs: ZendEngine2 / zend_language_scanner.l

tony2001		Wed Aug 20 13:46:30 2008 UTC

  Modified files:              
    /ZendEngine2	zend_language_scanner.l 
  Log:
  initialize variable and fix WS
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.195&r2=1.196&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.195 ZendEngine2/zend_language_scanner.l:1.196
--- ZendEngine2/zend_language_scanner.l:1.195	Fri Aug 15 19:45:25 2008
+++ ZendEngine2/zend_language_scanner.l	Wed Aug 20 13:46:29 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.l,v 1.195 2008/08/15 19:45:25 felipe Exp $ */
+/* $Id: zend_language_scanner.l,v 1.196 2008/08/20 13:46:29 tony2001 Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
@@ -592,7 +592,7 @@
 
 int zend_unicode_yyinput(zend_file_handle *file_handle, char *buf, size_t len TSRMLS_DC)
 {
-	size_t n;
+	size_t n = len;
 	const char *src = buf;
 
 #ifdef scottmac_0
@@ -614,10 +614,11 @@
 		n = zend_stream_read(file_handle, buf, len TSRMLS_CC);
 	}
 #endif
+	
 	/* Don't make any conversions if unicode=off */
-  if (!UG(unicode)) {
-  	return n;
-  }
+	if (!UG(unicode)) {
+		return n;
+	}
 
 	/* Autodetect encoding */
 	if (!SCNG(encoding_checked)) {



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