Skip to content

Commit afa08b5

Browse files
authored
Remove useless code in ext-enchant (#16940)
The MSHUTDOWN() does nothing, and the GET_BROKER macros are duplicated.
1 parent ba6c005 commit afa08b5

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

ext/enchant/enchant.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ zend_module_entry enchant_module_entry = {
8989
"enchant",
9090
ext_functions,
9191
PHP_MINIT(enchant),
92-
PHP_MSHUTDOWN(enchant),
92+
NULL,
9393
NULL, /* Replace with NULL if there's nothing to do at request start */
9494
NULL, /* Replace with NULL if there's nothing to do at request end */
9595
PHP_MINFO(enchant),
@@ -213,13 +213,6 @@ PHP_MINIT_FUNCTION(enchant)
213213
}
214214
/* }}} */
215215

216-
/* {{{ PHP_MSHUTDOWN_FUNCTION */
217-
PHP_MSHUTDOWN_FUNCTION(enchant)
218-
{
219-
return SUCCESS;
220-
}
221-
/* }}} */
222-
223216
static void __enumerate_providers_fn (const char * const name,
224217
const char * const desc,
225218
const char * const file,
@@ -353,13 +346,11 @@ PHP_FUNCTION(enchant_broker_set_dict_path)
353346

354347
switch (dict_type) {
355348
case PHP_ENCHANT_MYSPELL:
356-
PHP_ENCHANT_GET_BROKER;
357349
enchant_broker_set_param(pbroker->pbroker, "enchant.myspell.dictionary.path", (const char *)value);
358350
RETURN_TRUE;
359351
break;
360352

361353
case PHP_ENCHANT_ISPELL:
362-
PHP_ENCHANT_GET_BROKER;
363354
enchant_broker_set_param(pbroker->pbroker, "enchant.ispell.dictionary.path", (const char *)value);
364355
RETURN_TRUE;
365356
break;
@@ -389,12 +380,10 @@ PHP_FUNCTION(enchant_broker_get_dict_path)
389380

390381
switch (dict_type) {
391382
case PHP_ENCHANT_MYSPELL:
392-
PHP_ENCHANT_GET_BROKER;
393383
value = enchant_broker_get_param(pbroker->pbroker, "enchant.myspell.dictionary.path");
394384
break;
395385

396386
case PHP_ENCHANT_ISPELL:
397-
PHP_ENCHANT_GET_BROKER;
398387
value = enchant_broker_get_param(pbroker->pbroker, "enchant.ispell.dictionary.path");
399388
break;
400389

0 commit comments

Comments
 (0)