Conditions optimization

diff --git a/ext/standard/file.c b/ext/standard/file.c
index d2874d8cbb8c681bd5570d25a10e17ff12331dc5..b55fd49b5bb87dd710ca0facea31c70946febfeb 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2244,11 +2244,10 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char
                                                                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;