]> granicus.if.org Git - php/commitdiff
- simplify
authorPierre Joye <pajoye@php.net>
Tue, 26 Jul 2011 09:27:53 +0000 (09:27 +0000)
committerPierre Joye <pajoye@php.net>
Tue, 26 Jul 2011 09:27:53 +0000 (09:27 +0000)
main/fopen_wrappers.c

index 8766aaf893997d51a17d22c64180c0962aa1abac..2c18044b33432a320226d2ee455c8efeea7e942d 100644 (file)
@@ -628,16 +628,11 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c
        filename_length = strlen(filename);
 
        /* Relative path open */
-       if (*filename == '.') {
-               return php_fopen_and_set_opened_path(filename, mode, opened_path TSRMLS_CC);
-       }
-
+       if ((*filename == '.')
        /* Absolute path open */
-       if (IS_ABSOLUTE_PATH(filename, filename_length)) {
-               return php_fopen_and_set_opened_path(filename, mode, opened_path TSRMLS_CC);
-       }
-
-       if (!path || (path && !*path)) {
+        || IS_ABSOLUTE_PATH(filename, filename_length)
+        || (!path || (path && !*path))
+       ) {
                return php_fopen_and_set_opened_path(filename, mode, opened_path TSRMLS_CC);
        }