Regroup the ifdef'd occurrences

diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
index b793aa445ae0f93fae26c0e5ac6f9b4770a203c9..8a4953c39fff947e188727ed9a0105e2f1beba15 100644 (file)
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -51,6 +51,14 @@
 # include <sys/file.h>
 #endif
 
+#ifndef ZEND_WIN32
+#define zend_file_cache_unlink unlink
+#define zend_file_cache_open open
+#else
+#define zend_file_cache_unlink php_win32_ioutil_unlink
+#define zend_file_cache_open php_win32_ioutil_open
+#endif
+
 #ifdef ZEND_WIN32
 # define LOCK_SH 0
 # define LOCK_EX 1
@@ -809,11 +817,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
                return FAILURE;
        }
 
-#ifndef ZEND_WIN32
-       fd = open(filename, O_CREAT | O_EXCL | O_RDWR | O_BINARY, S_IRUSR | S_IWUSR);
-#else
-       fd = php_win32_ioutil_open(filename, O_CREAT | O_EXCL | O_RDWR | O_BINARY, _S_IREAD | _S_IWRITE);
-#endif
+       fd = zend_file_cache_open(filename, O_CREAT | O_EXCL | O_RDWR | O_BINARY, S_IRUSR | S_IWUSR);
        if (fd < 0) {
                if (errno != EEXIST) {
                        zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot create file '%s', %s\n", filename, strerror(errno));
@@ -864,7 +868,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
                zend_string_release_ex((zend_string*)ZCG(mem), 0);
                close(fd);
                efree(mem);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                efree(filename);
                return FAILURE;
        }
@@ -878,7 +882,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
                zend_string_release_ex((zend_string*)ZCG(mem), 0);
                close(fd);
                efree(mem);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                efree(filename);
                return FAILURE;
        }
@@ -1346,11 +1350,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
        }
        filename = zend_file_cache_get_bin_file_path(full_path);
 
-#ifndef ZEND_WIN32
-       fd = open(filename, O_RDONLY | O_BINARY);
-#else
-       fd = php_win32_ioutil_open(filename, O_RDONLY | O_BINARY);
-#endif
+       fd = zend_file_cache_open(filename, O_RDONLY | O_BINARY);
        if (fd < 0) {
                efree(filename);
                return NULL;
@@ -1366,7 +1366,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
                zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s' (info)\n", filename);
                zend_file_cache_flock(fd, LOCK_UN);
                close(fd);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                efree(filename);
                return NULL;
        }
@@ -1376,7 +1376,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
                zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s' (wrong header)\n", filename);
                zend_file_cache_flock(fd, LOCK_UN);
                close(fd);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                efree(filename);
                return NULL;
        }
@@ -1384,7 +1384,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
                zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s' (wrong \"system_id\")\n", filename);
                zend_file_cache_flock(fd, LOCK_UN);
                close(fd);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                efree(filename);
                return NULL;
        }
@@ -1396,7 +1396,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
                        zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot unlock file '%s'\n", filename);
                }
                close(fd);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                efree(filename);
                return NULL;
        }
@@ -1414,7 +1414,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
                zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s' (mem)\n", filename);
                zend_file_cache_flock(fd, LOCK_UN);
                close(fd);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                zend_arena_release(&CG(arena), checkpoint);
                efree(filename);
                return NULL;
@@ -1428,7 +1428,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
        if (ZCG(accel_directives).file_cache_consistency_checks &&
            zend_adler32(ADLER32_INIT, mem, info.mem_size + info.str_size) != info.checksum) {
                zend_accel_error(ACCEL_LOG_WARNING, "corrupted file '%s'\n", filename);
-               unlink(filename);
+               zend_file_cache_unlink(filename);
                zend_arena_release(&CG(arena), checkpoint);
                efree(filename);
                return NULL;
@@ -1526,11 +1526,7 @@ void zend_file_cache_invalidate(zend_string *full_path)
 
        filename = zend_file_cache_get_bin_file_path(full_path);
 
-#ifndef ZEND_WIN32
-       unlink(filename);
-#else
-       php_win32_ioutil_unlink(filename);
-#endif
+       zend_file_cache_unlink(filename);
        efree(filename);
 }