From: Marcus Boerger <helly@php.net>
Date: Tue, 25 Mar 2008 21:58:03 +0000 (+0000)
Subject: - Use sizeof rather than strlen and cleanup
X-Git-Tag: RELEASE_2_0_0a1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd366b66da9b0d7b92efab00f538d5d3aacd6f16;p=php

- Use sizeof rather than strlen and cleanup
---

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 8aad625450..6b0f419cf2 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -115,13 +115,13 @@ enum behavior_mode {
 	PHP_MODE_SHOW_INI_CONFIG
 };
 
-#define HARDCODED_INI			\
-	"html_errors=0\n"			\
-	"register_argc_argv=1\n"	\
-	"implicit_flush=1\n"		\
-	"output_buffering=0\n"		\
-	"max_execution_time=0\n"	\
-	"max_input_time=-1\n"
+const char HARDCODED_INI[] =
+	"html_errors=0\n"
+	"register_argc_argv=1\n"
+	"implicit_flush=1\n"
+	"output_buffering=0\n"
+	"max_execution_time=0\n"
+	"max_input_time=-1\n\0";
 
 static char *php_optarg = NULL;
 static int php_optind = 1;
@@ -671,10 +671,9 @@ int main(int argc, char *argv[])
 	setmode(_fileno(stderr), O_BINARY);		/* make the stdio mode be binary */
 #endif
 
-	ini_entries_len = strlen(HARDCODED_INI);
-	cli_sapi_module.ini_entries = malloc(ini_entries_len+2);
-	memcpy(cli_sapi_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
-	cli_sapi_module.ini_entries[ini_entries_len+1] = 0;
+	ini_entries_len = sizeof(HARDCODED_INI)-2;
+	cli_sapi_module.ini_entries = malloc(sizeof(HARDCODED_INI));
+	memcpy(cli_sapi_module.ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI));
 
 	while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2))!=-1) {
 		switch (c) {