diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 16:50:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 17:07:26 +0200 |
| commit | e0eca262852dba1a78afcde64a49126c81fead1a (patch) | |
| tree | a23dd4d3622362459724096a5404e642b1d71db6 /Zend | |
| parent | 49bac9b77bc9cacc0f984092d226e951ae336b43 (diff) | |
| download | php-git-e0eca262852dba1a78afcde64a49126c81fead1a.tar.gz | |
Drop free_filename field from zend_file_handle
free_filename was always zero.
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_language_scanner.l | 3 | ||||
| -rw-r--r-- | Zend/zend_stream.c | 5 | ||||
| -rw-r--r-- | Zend/zend_stream.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 5526a0a0b3..82e884d583 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -292,9 +292,6 @@ ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle) zend_llist_del_element(&CG(open_files), file_handle, (int (*)(void *, void *)) zend_compare_file_handles); /* zend_file_handle_dtor() operates on the copy, so we have to NULLify the original here */ file_handle->opened_path = NULL; - if (file_handle->free_filename) { - file_handle->filename = NULL; - } } ZEND_API void zend_lex_tstring(zval *zv) diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c index 08a1db2583..9e81e3acab 100644 --- a/Zend/zend_stream.c +++ b/Zend/zend_stream.c @@ -116,7 +116,6 @@ ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle) /* handle->opened_path = NULL; handle->handle.fp = zend_fopen(filename, &handle->opened_path); handle->filename = filename; - handle->free_filename = 0; memset(&handle->handle.stream.mmap, 0, sizeof(zend_mmap)); return (handle->handle.fp) ? SUCCESS : FAILURE; @@ -261,10 +260,6 @@ ZEND_API void zend_file_handle_dtor(zend_file_handle *fh) /* {{{ */ zend_string_release_ex(fh->opened_path, 0); fh->opened_path = NULL; } - if (fh->free_filename && fh->filename) { - efree((char*)fh->filename); - fh->filename = NULL; - } } /* }}} */ diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h index 18b07d6b3c..a554bb884c 100644 --- a/Zend/zend_stream.h +++ b/Zend/zend_stream.h @@ -65,7 +65,6 @@ typedef struct _zend_file_handle { const char *filename; zend_string *opened_path; zend_stream_type type; - zend_bool free_filename; } zend_file_handle; BEGIN_EXTERN_C() |