From: Xinchen Hui <laruence@php.net>
Date: Mon, 8 Aug 2011 06:49:17 +0000 (+0000)
Subject: Make codes more clearly, and make the static analyzer silent..
X-Git-Tag: php-5.4.0beta1~481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7852bcb00f1911b97b22facf572181be33d58c2;p=php

Make codes more clearly, and make the static analyzer silent..
---

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 2bee7e9803..f57e4afab3 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -245,22 +245,22 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
 				}
 			} else {
 				tmp2 = **tmp;
-				switch (Z_TYPE_PP(tmp)) {
-					default:
-						tmp = NULL;
-						zval_copy_ctor(&tmp2);
-						convert_to_string(&tmp2);
-					case IS_STRING:
-						if (!sapi_module.phpinfo_as_text) {
-							if (Z_STRLEN(tmp2) == 0) {
-								php_info_print("<i>no value</i>");
-							} else {
-								php_info_print_html_esc(Z_STRVAL(tmp2), Z_STRLEN(tmp2));
-							}
-						} else {
-							php_info_print(Z_STRVAL(tmp2));
-						}
+				if (Z_TYPE_PP(tmp) != IS_STRING) {
+					tmp = NULL;
+					zval_copy_ctor(&tmp2);
+					convert_to_string(&tmp2);
 				}
+
+				if (!sapi_module.phpinfo_as_text) {
+					if (Z_STRLEN(tmp2) == 0) {
+						php_info_print("<i>no value</i>");
+					} else {
+						php_info_print_html_esc(Z_STRVAL(tmp2), Z_STRLEN(tmp2));
+					}
+				} else {
+					php_info_print(Z_STRVAL(tmp2));
+				}
+
 				if (!tmp) {
 					zval_dtor(&tmp2);
 				}