Address code review comments

kocsismate · kocsismate · commit 0b5adb0cd66b · 2020-05-08T10:14:14.000+02:00
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -605,12 +605,6 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval *op) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op) /* {{{ */
-{
-	_convert_to_string(op);
-}
-/* }}} */
-
 ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op) /* {{{ */
 {
 try_again:
@@ -945,9 +939,7 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo
 			return zend_long_to_str(Z_LVAL_P(op));
 		}
 		case IS_DOUBLE: {
-			zend_string *str = zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));
-
-			return str;
+			return zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));
 		}
 		case IS_ARRAY:
 			zend_error(E_WARNING, "Array to string conversion");
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -257,7 +257,6 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1);
 ZEND_API int ZEND_FASTCALL decrement_function(zval *op2);
 
 ZEND_API void ZEND_FASTCALL convert_scalar_to_number(zval *op);
-ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op);
 ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op);
 ZEND_API void ZEND_FASTCALL convert_to_long(zval *op);
 ZEND_API void ZEND_FASTCALL convert_to_double(zval *op);
@@ -340,7 +339,6 @@ static zend_always_inline zend_bool try_convert_to_string(zval *op) {
 #define _zval_get_double_func(op) zval_get_double_func(op)
 #define _zval_get_string_func(op) zval_get_string_func(op)
 
-#define convert_to_cstring(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_cstring((op)); }
 #define convert_to_string(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_string((op)); }
 
 
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -1987,7 +1987,7 @@ PHP_FUNCTION(pg_query_params)
 				zval tmp_val;
 
 				ZVAL_COPY(&tmp_val, tmp);
-				convert_to_cstring(&tmp_val);
+				convert_to_string(&tmp_val);
 				if (Z_TYPE(tmp_val) != IS_STRING) {
 					php_error_docref(NULL, E_WARNING,"Error converting parameter");
 					zval_ptr_dtor(&tmp_val);

Original file line number	Diff line number	Diff line change
`@@ -605,12 +605,6 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval op) / {{{ */`
`605`	`605`	`}`
`606`	`606`	`/* }}} */`
`607`	`607`
`608`		`-ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval op) / {{{ */`
`609`		`-{`
`610`		`- _convert_to_string(op);`
`611`		`-}`
`612`		`-/* }}} */`
`613`		`-`
`614`	`608`	`ZEND_API void ZEND_FASTCALL _convert_to_string(zval op) / {{{ */`
`615`	`609`	`{`
`616`	`610`	`try_again:`
`@@ -945,9 +939,7 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo`
`945`	`939`	`return zend_long_to_str(Z_LVAL_P(op));`
`946`	`940`	`}`
`947`	`941`	`case IS_DOUBLE: {`
`948`		`- zend_string str = zend_strpprintf_unchecked(0, "%.H", (int) EG(precision), Z_DVAL_P(op));`
`949`		`-`
`950`		`- return str;`
	`942`	`+ return zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));`
`951`	`943`	`}`
`952`	`944`	`case IS_ARRAY:`
`953`	`945`	`zend_error(E_WARNING, "Array to string conversion");`