Skip to content

Commit 3dbfdf5

Browse files
committed
Remove old file submodule dtor
1 parent 8fb9002 commit 3dbfdf5

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

ext/standard/basic_functions.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
382382
BASIC_MSHUTDOWN_SUBMODULE(array)
383383
BASIC_MSHUTDOWN_SUBMODULE(assert)
384384
BASIC_MSHUTDOWN_SUBMODULE(url_scanner_ex)
385-
BASIC_MSHUTDOWN_SUBMODULE(file)
386385
BASIC_MSHUTDOWN_SUBMODULE(standard_filters)
387386
#ifdef ZTS
388387
BASIC_MSHUTDOWN_SUBMODULE(localeconv)

ext/standard/file.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ static void file_globals_ctor(php_file_globals *file_globals_p)
134134
file_globals_p->def_chunk_size = PHP_SOCK_CHUNK_SIZE;
135135
}
136136

137-
static void file_globals_dtor(php_file_globals *file_globals_p)
138-
{
139-
}
140-
141137
static PHP_INI_MH(OnUpdateAutoDetectLineEndings)
142138
{
143139
if (zend_ini_parse_bool(new_value)) {
@@ -158,7 +154,7 @@ PHP_MINIT_FUNCTION(file)
158154
le_stream_context = zend_register_list_destructors_ex(file_context_dtor, NULL, "stream-context", module_number);
159155

160156
#ifdef ZTS
161-
ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor);
157+
ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) NULL);
162158
#else
163159
file_globals_ctor(&file_globals);
164160
#endif
@@ -171,15 +167,6 @@ PHP_MINIT_FUNCTION(file)
171167
}
172168
/* }}} */
173169

174-
PHP_MSHUTDOWN_FUNCTION(file) /* {{{ */
175-
{
176-
#ifndef ZTS
177-
file_globals_dtor(&file_globals);
178-
#endif
179-
return SUCCESS;
180-
}
181-
/* }}} */
182-
183170
PHPAPI void php_flock_common(php_stream *stream, zend_long operation,
184171
uint32_t operation_arg_num, zval *wouldblock, zval *return_value)
185172
{

ext/standard/file.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "php_network.h"
2121

2222
PHP_MINIT_FUNCTION(file);
23-
PHP_MSHUTDOWN_FUNCTION(file);
2423

2524
PHPAPI PHP_FUNCTION(fclose);
2625
PHPAPI PHP_FUNCTION(feof);

0 commit comments

Comments
 (0)