From: Zeev Suraski <zeev@php.net>
Date: Wed, 28 Apr 1999 21:29:31 +0000 (+0000)
Subject: Remove redundant code
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d843632629fa6705ebe1f15818e4f73fbe9c9e17;p=php

Remove redundant code
---

diff --git a/main/main.c b/main/main.c
index 12b3fd59fb..a4da4b9851 100644
--- a/main/main.c
+++ b/main/main.c
@@ -188,14 +188,14 @@ static PHP_INI_MH(OnUpdateErrorReporting)
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("short_open_tag",		"1",		PHP_INI_ALL,		OnUpdateInt,		short_tags,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("asp_tags",			"0",		PHP_INI_ALL,		OnUpdateInt,		asp_tags,		php_core_globals,	core_globals)
-	PHP_INI_ENTRY1("precision",			"14",		PHP_INI_ALL,		OnSetPrecision,	NULL)
+	PHP_INI_ENTRY("precision",			"14",		PHP_INI_ALL,		OnSetPrecision)
 
-	PHP_INI_ENTRY1("highlight.comment",	HL_COMMENT_COLOR,	PHP_INI_ALL,		NULL,			NULL)
-	PHP_INI_ENTRY1("highlight.default",	HL_DEFAULT_COLOR,	PHP_INI_ALL,		NULL,			NULL)
-	PHP_INI_ENTRY1("highlight.html",	HL_HTML_COLOR,		PHP_INI_ALL,		NULL,			NULL)
-	PHP_INI_ENTRY1("highlight.string",	HL_STRING_COLOR,	PHP_INI_ALL,		NULL,			NULL)
-	PHP_INI_ENTRY1("highlight.bg",		HL_BG_COLOR,		PHP_INI_ALL,		NULL,			NULL)
-	PHP_INI_ENTRY1("highlight.keyword",	HL_KEYWORD_COLOR,	PHP_INI_ALL,		NULL,			NULL)
+	PHP_INI_ENTRY("highlight.comment",	HL_COMMENT_COLOR,	PHP_INI_ALL,		NULL)
+	PHP_INI_ENTRY("highlight.default",	HL_DEFAULT_COLOR,	PHP_INI_ALL,		NULL)
+	PHP_INI_ENTRY("highlight.html",		HL_HTML_COLOR,		PHP_INI_ALL,		NULL)
+	PHP_INI_ENTRY("highlight.string",	HL_STRING_COLOR,	PHP_INI_ALL,		NULL)
+	PHP_INI_ENTRY("highlight.bg",		HL_BG_COLOR,		PHP_INI_ALL,		NULL)
+	PHP_INI_ENTRY("highlight.keyword",	HL_KEYWORD_COLOR,	PHP_INI_ALL,		NULL)
 
 	STD_PHP_INI_ENTRY("magic_quotes_gpc",		"1",	PHP_INI_ALL,		OnUpdateInt,		magic_quotes_gpc,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("magic_quotes_runtime",	"0",	PHP_INI_ALL,		OnUpdateInt,		magic_quotes_runtime,	php_core_globals,	core_globals)
@@ -206,11 +206,11 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("safe_mode_exec_dir",	"1",	PHP_INI_SYSTEM,			OnUpdateString,	safe_mode_exec_dir,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("enable_dl",		"1",		PHP_INI_SYSTEM,			OnUpdateInt,		enable_dl,				php_core_globals,	core_globals)
 
-	PHP_INI_ENTRY1("SMTP",			"localhost",			PHP_INI_ALL,		NULL,		NULL)
-	PHP_INI_ENTRY1("sendmail_path",	DEFAULT_SENDMAIL_PATH,	PHP_INI_SYSTEM,		NULL,		NULL)
-	PHP_INI_ENTRY1("sendmail_from",	NULL,					PHP_INI_ALL,		NULL,		NULL)
+	PHP_INI_ENTRY("SMTP",			"localhost",			PHP_INI_ALL,		NULL)
+	PHP_INI_ENTRY("sendmail_path",	DEFAULT_SENDMAIL_PATH,	PHP_INI_SYSTEM,		NULL)
+	PHP_INI_ENTRY("sendmail_from",	NULL,					PHP_INI_ALL,		NULL)
 
-	PHP_INI_ENTRY1("error_reporting",	NULL,				PHP_INI_ALL,		OnUpdateErrorReporting,		NULL)
+	PHP_INI_ENTRY("error_reporting",	NULL,				PHP_INI_ALL,		OnUpdateErrorReporting)
 	STD_PHP_INI_ENTRY("display_errors",		"1",			PHP_INI_ALL,		OnUpdateInt,		display_errors,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("track_errors",		"0",			PHP_INI_ALL,		OnUpdateInt,		track_errors,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("log_errors",			"0",			PHP_INI_ALL,		OnUpdateInt,		log_errors,			php_core_globals,	core_globals)
@@ -231,12 +231,12 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("upload_tmp_dir",			NULL,			PHP_INI_SYSTEM,		OnUpdateStringUnempty,	upload_tmp_dir,			php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("upload_max_filesize",	"2097152",		PHP_INI_ALL,		OnUpdateInt,				upload_max_filesize,	php_core_globals,	core_globals)
 
-	PHP_INI_ENTRY1("browscap",			NULL,				PHP_INI_SYSTEM,		NULL,			NULL)
+	PHP_INI_ENTRY("browscap",			NULL,				PHP_INI_SYSTEM,		NULL)
 
-	PHP_INI_ENTRY1("define_syslog_variables",	"0",		PHP_INI_ALL,		NULL,			NULL)
+	PHP_INI_ENTRY("define_syslog_variables",	"0",		PHP_INI_ALL,		NULL)
 
-	PHP_INI_ENTRY1("max_execution_time",		"30",			PHP_INI_ALL,		OnChangeMaxExecutionTime,		NULL)
-	PHP_INI_ENTRY1("memory_limit",			"8388608",		PHP_INI_ALL,		OnChangeMemoryLimit,			NULL)
+	PHP_INI_ENTRY("max_execution_time",		"30",			PHP_INI_ALL,		OnChangeMaxExecutionTime)
+	PHP_INI_ENTRY("memory_limit",			"8388608",		PHP_INI_ALL,		OnChangeMemoryLimit)
 
 	STD_PHP_INI_ENTRY("track_vars",				"0",			PHP_INI_ALL,		OnUpdateInt,				track_vars,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("gpc_order",				"GPC",			PHP_INI_ALL,		OnUpdateStringUnempty,	gpc_order,		php_core_globals,	core_globals)