From: Michael Wallner <mike@php.net>
Date: Thu, 10 Jul 2014 14:39:17 +0000 (+0200)
Subject: simplify
X-Git-Tag: RELEASE_2_0_7~6
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=3ecc68196ad39199abde298391756bfcfd636504

simplify
---

diff --git a/php_http_misc.h b/php_http_misc.h
index 3759a1a..e7d2258 100644
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -140,42 +140,37 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 		Z_ARRVAL_P(zv) = (ht); \
 	}
 
-static inline zval *php_http_ztyp(int type, zval *z)
+static inline zval *php_http_zconv(int type, zval *z)
 {
-	SEPARATE_ARG_IF_REF(z);
-	if (Z_TYPE_P(z) != type) {
-		switch (type) {
-			case IS_NULL:	convert_to_null_ex(&z);		break;
-			case IS_BOOL:	convert_to_boolean_ex(&z);	break;
-			case IS_LONG:	convert_to_long_ex(&z);		break;
-			case IS_DOUBLE:	convert_to_double_ex(&z);	break;
-			case IS_STRING:	convert_to_string_ex(&z);	break;
-			case IS_ARRAY:	convert_to_array_ex(&z);	break;
-			case IS_OBJECT:	convert_to_object_ex(&z);	break;
-		}
+	switch (type) {
+		case IS_NULL:	convert_to_null_ex(&z);		break;
+		case IS_BOOL:	convert_to_boolean_ex(&z);	break;
+		case IS_LONG:	convert_to_long_ex(&z);		break;
+		case IS_DOUBLE:	convert_to_double_ex(&z);	break;
+		case IS_STRING:	convert_to_string_ex(&z);	break;
+		case IS_ARRAY:	convert_to_array_ex(&z);	break;
+		case IS_OBJECT:	convert_to_object_ex(&z);	break;
 	}
 	return z;
 }
 
+static inline zval *php_http_ztyp(int type, zval *z)
+{
+	SEPARATE_ARG_IF_REF(z);
+	return (Z_TYPE_P(z) == type) ? z : php_http_zconv(type, z);
+}
+
 static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z)
 {
 	if (add_ref) {
 		Z_ADDREF_P(z);
 	}
 	if (Z_TYPE_P(z) != type) {
-		switch (type) {
-			case IS_NULL:	convert_to_null_ex(&z);		break;
-			case IS_BOOL:	convert_to_boolean_ex(&z);	break;
-			case IS_LONG:	convert_to_long_ex(&z);		break;
-			case IS_DOUBLE:	convert_to_double_ex(&z);	break;
-			case IS_STRING:	convert_to_string_ex(&z);	break;
-			case IS_ARRAY:	convert_to_array_ex(&z);	break;
-			case IS_OBJECT:	convert_to_object_ex(&z);	break;
-		}
+		return php_http_zconv(type, z);
 	} else {
 		SEPARATE_ZVAL_IF_NOT_REF(&z);
+		return z;
 	}
-	return z;
 }
 
 static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, const char **value_str, size_t *value_len, zend_bool orig TSRMLS_DC)