php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ZEND_HANDLE_FD

Browse Source 
This handle type was unused.
This commit is contained in:
Nikita Popov
2019-07-16 14:51:48 +02:00
parent 5161cebe28
commit e08cc4d921
4 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Zend/zend_stream.c
View File

@@ -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:

2
Zend/zend_stream.h
View File

@@ -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;

5
ext/opcache/ZendAccelerator.c
View File

@@ -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) {

1
ext/phar/phar_object.c
View File

@@ -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;