Skip to content

Commit c3b3e90

Browse files
authored
ext/odbc: Remove unused INI settings (#14399)
1 parent f69c55b commit c3b3e90

File tree

2 files changed

+0
-38
lines changed

2 files changed

+0
-38
lines changed

ext/odbc/php_odbc.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -370,35 +370,6 @@ static PHP_INI_DISP(display_link_nums)
370370
}
371371
/* }}} */
372372

373-
/* {{{ PHP_INI_DISP(display_defPW) */
374-
static PHP_INI_DISP(display_defPW)
375-
{
376-
char *value;
377-
378-
if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
379-
value = ZSTR_VAL(ini_entry->orig_value);
380-
} else if (ini_entry->value) {
381-
value = ZSTR_VAL(ini_entry->value);
382-
} else {
383-
value = NULL;
384-
}
385-
386-
if (value) {
387-
#if PHP_DEBUG
388-
php_printf("%s", value);
389-
#else
390-
PUTS("********");
391-
#endif
392-
} else {
393-
if (PG(html_errors)) {
394-
PUTS("<i>no value</i>");
395-
} else {
396-
PUTS("no value");
397-
}
398-
}
399-
}
400-
/* }}} */
401-
402373
/* {{{ PHP_INI_DISP(display_binmode) */
403374
static PHP_INI_DISP(display_binmode)
404375
{
@@ -501,12 +472,6 @@ PHP_INI_BEGIN()
501472
max_persistent, zend_odbc_globals, odbc_globals, display_link_nums)
502473
STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong,
503474
max_links, zend_odbc_globals, odbc_globals, display_link_nums)
504-
STD_PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, OnUpdateString,
505-
defDB, zend_odbc_globals, odbc_globals)
506-
STD_PHP_INI_ENTRY("odbc.default_user", NULL, PHP_INI_ALL, OnUpdateString,
507-
defUser, zend_odbc_globals, odbc_globals)
508-
STD_PHP_INI_ENTRY_EX("odbc.default_pw", NULL, PHP_INI_ALL, OnUpdateString,
509-
defPW, zend_odbc_globals, odbc_globals, display_defPW)
510475
STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateLong,
511476
defaultlrl, zend_odbc_globals, odbc_globals, display_lrl)
512477
STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateLong,

ext/odbc/php_odbc_includes.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,6 @@ typedef struct odbc_result {
233233
} odbc_result;
234234

235235
ZEND_BEGIN_MODULE_GLOBALS(odbc)
236-
char *defDB;
237-
char *defUser;
238-
char *defPW;
239236
bool allow_persistent;
240237
bool check_persistent;
241238
zend_long max_persistent;

0 commit comments

Comments
 (0)