Skip to content

Commit e08cc4d

Browse files
committed
Remove ZEND_HANDLE_FD
This handle type was unused.
1 parent 5161ceb commit e08cc4d

File tree

4 files changed

+0
-17
lines changed

4 files changed

+0
-17
lines changed

Zend/zend_stream.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
149149
}
150150

151151
switch (file_handle->type) {
152-
case ZEND_HANDLE_FD:
153-
file_handle->type = ZEND_HANDLE_FP;
154-
file_handle->handle.fp = fdopen(file_handle->handle.fd, "rb");
155-
/* no break; */
156152
case ZEND_HANDLE_FP:
157153
if (!file_handle->handle.fp) {
158154
return FAILURE;
@@ -232,9 +228,6 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
232228
ZEND_API void zend_file_handle_dtor(zend_file_handle *fh) /* {{{ */
233229
{
234230
switch (fh->type) {
235-
case ZEND_HANDLE_FD:
236-
/* nothing to do */
237-
break;
238231
case ZEND_HANDLE_FP:
239232
fclose(fh->handle.fp);
240233
break;
@@ -268,8 +261,6 @@ ZEND_API int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *
268261
return 0;
269262
}
270263
switch (fh1->type) {
271-
case ZEND_HANDLE_FD:
272-
return fh1->handle.fd == fh2->handle.fd;
273264
case ZEND_HANDLE_FP:
274265
return fh1->handle.fp == fh2->handle.fp;
275266
case ZEND_HANDLE_STREAM:

Zend/zend_stream.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ typedef void (*zend_stream_closer_t)(void* handle);
3636

3737
typedef enum {
3838
ZEND_HANDLE_FILENAME,
39-
ZEND_HANDLE_FD,
4039
ZEND_HANDLE_FP,
4140
ZEND_HANDLE_STREAM,
4241
ZEND_HANDLE_MAPPED
@@ -60,7 +59,6 @@ typedef struct _zend_stream {
6059

6160
typedef struct _zend_file_handle {
6261
union {
63-
int fd;
6462
FILE *fp;
6563
zend_stream stream;
6664
} handle;

ext/opcache/ZendAccelerator.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -962,11 +962,6 @@ accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle, size_
962962
#endif
963963

964964
switch (file_handle->type) {
965-
case ZEND_HANDLE_FD:
966-
if (zend_fstat(file_handle->handle.fd, &statbuf) == -1) {
967-
return 0;
968-
}
969-
break;
970965
case ZEND_HANDLE_FP:
971966
if (zend_fstat(fileno(file_handle->handle.fp), &statbuf) == -1) {
972967
if (zend_get_stream_timestamp(file_handle->filename, &statbuf) != SUCCESS) {

ext/phar/phar_object.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char
220220
}
221221

222222
file_handle.type = ZEND_HANDLE_FILENAME;
223-
file_handle.handle.fd = 0;
224223
file_handle.filename = name;
225224
file_handle.opened_path = NULL;
226225
file_handle.free_filename = 0;

0 commit comments

Comments
 (0)