Skip to content

Commit b4e3c0c

Browse files
committed
Remove old file submodule dtor
1 parent c22fd2c commit b4e3c0c

3 files changed

Lines changed: 1 addition & 16 deletions

File tree

ext/standard/basic_functions.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
371371
BASIC_MSHUTDOWN_SUBMODULE(array)
372372
BASIC_MSHUTDOWN_SUBMODULE(assert)
373373
BASIC_MSHUTDOWN_SUBMODULE(url_scanner_ex)
374-
BASIC_MSHUTDOWN_SUBMODULE(file)
375374
BASIC_MSHUTDOWN_SUBMODULE(standard_filters)
376375
#ifdef ZTS
377376
BASIC_MSHUTDOWN_SUBMODULE(localeconv)

ext/standard/file.c

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

134-
static void file_globals_dtor(php_file_globals *file_globals_p)
135-
{
136-
}
137-
138134
static PHP_INI_MH(OnUpdateAutoDetectLineEndings)
139135
{
140136
if (zend_ini_parse_bool(new_value)) {
@@ -155,7 +151,7 @@ PHP_MINIT_FUNCTION(file)
155151
le_stream_context = zend_register_list_destructors_ex(file_context_dtor, NULL, "stream-context", module_number);
156152

157153
#ifdef ZTS
158-
ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor);
154+
ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) NULL);
159155
#else
160156
file_globals_ctor(&file_globals);
161157
#endif
@@ -168,15 +164,6 @@ PHP_MINIT_FUNCTION(file)
168164
}
169165
/* }}} */
170166

171-
PHP_MSHUTDOWN_FUNCTION(file) /* {{{ */
172-
{
173-
#ifndef ZTS
174-
file_globals_dtor(&file_globals);
175-
#endif
176-
return SUCCESS;
177-
}
178-
/* }}} */
179-
180167
PHPAPI void php_flock_common(php_stream *stream, zend_long operation,
181168
uint32_t operation_arg_num, zval *wouldblock, zval *return_value)
182169
{

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)