Remove ZEND_HANDLE_FD

This handle type was unused.

diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index 87ed617ef0524256b9ef31c9a9c0cee01e339aa7..110ac805cf44e80de74fb2c30e941c4aaeac3398 100644 (file)
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -149,10 +149,6 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
        }
 
        switch (file_handle->type) {
-               case ZEND_HANDLE_FD:
-                       file_handle->type = ZEND_HANDLE_FP;
-                       file_handle->handle.fp = fdopen(file_handle->handle.fd, "rb");
-                       /* no break; */
                case ZEND_HANDLE_FP:
                        if (!file_handle->handle.fp) {
                                return FAILURE;
@@ -232,9 +228,6 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
 ZEND_API void zend_file_handle_dtor(zend_file_handle *fh) /* {{{ */
 {
        switch (fh->type) {
-               case ZEND_HANDLE_FD:
-                       /* nothing to do */
-                       break;
                case ZEND_HANDLE_FP:
                        fclose(fh->handle.fp);
                        break;
@@ -268,8 +261,6 @@ ZEND_API int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *
                return 0;
        }
        switch (fh1->type) {
-               case ZEND_HANDLE_FD:
-                       return fh1->handle.fd == fh2->handle.fd;
                case ZEND_HANDLE_FP:
                        return fh1->handle.fp == fh2->handle.fp;
                case ZEND_HANDLE_STREAM:

diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index cf6d76437b34414b4ae6c1a986cb67b584da7509..c10292d2721a5ecf85c0d51414bab8ef5278a166 100644 (file)
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -36,7 +36,6 @@ typedef void   (*zend_stream_closer_t)(void* handle);
 
 typedef enum {
        ZEND_HANDLE_FILENAME,
-       ZEND_HANDLE_FD,
        ZEND_HANDLE_FP,
        ZEND_HANDLE_STREAM,
        ZEND_HANDLE_MAPPED
@@ -60,7 +59,6 @@ typedef struct _zend_stream {
 
 typedef struct _zend_file_handle {
        union {
-               int           fd;
                FILE          *fp;
                zend_stream   stream;
        } handle;

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index d16ae9097c361df989141d228007f184b34e7a6e..81d579d9a859f944db570972f0c7dae864ee4994 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -962,11 +962,6 @@ accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle, size_
 #endif
 
        switch (file_handle->type) {
-               case ZEND_HANDLE_FD:
-                       if (zend_fstat(file_handle->handle.fd, &statbuf) == -1) {
-                               return 0;
-                       }
-                       break;
                case ZEND_HANDLE_FP:
                        if (zend_fstat(fileno(file_handle->handle.fp), &statbuf) == -1) {
                                if (zend_get_stream_timestamp(file_handle->filename, &statbuf) != SUCCESS) {

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index cc53d94106c05a81842c4d2b8b4916bcbd6f5e15..783b7f77f86614a66da708d73e28e973856fb9ab 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -220,7 +220,6 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char
                        }
 
                        file_handle.type = ZEND_HANDLE_FILENAME;
-                       file_handle.handle.fd = 0;
                        file_handle.filename = name;
                        file_handle.opened_path = NULL;
                        file_handle.free_filename = 0;