cvs: php-src(PHP_5_3) /ext/standard file.c

dmitry Fri Nov 9 11:08:23 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard file.c Log: Conditions optimization http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.3&r2=1.409.2.6.2.28.2.4&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.3 php-src/ext/standard/file.c:1.409.2.6.2.28.2.4 --- php-src/ext/standard/file.c:1.409.2.6.2.28.2.3 Tue Nov 6 17:11:56 2007 +++ php-src/ext/standard/file.c Fri Nov 9 11:08:22 2007 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.3 2007/11/06 17:11:56 jani Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.4 2007/11/09 11:08:22 dmitry Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2244,11 +2244,10 @@ state = 0; break; default: - if ((escape_char == enclosure && *bptr == escape_char && *(bptr+1) == escape_char) - || (escape_char != enclosure && *bptr == escape_char)) { - state = 1; - } else if (*bptr == enclosure) { + if (*bptr == enclosure) { state = 2; + } else if (*bptr == escape_char) { + state = 1; } bptr++; break;