From 0c77d1dcd817bd159682344d186e920cd8c9c150 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 30 Oct 2017 14:32:44 +0100 Subject: Minor code cleanup --- src/sp_utils.c | 7 +------ src/tests/disabled_functions_param_array.phpt | 17 ----------------- 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'src') diff --git a/src/sp_utils.c b/src/sp_utils.c index fdd2b66..1ba0fe7 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c @@ -183,19 +183,14 @@ int sp_log_request(const char* folder) { static char *zv_str_to_char(zval *zv) { zval copy; - char *ret; - ZVAL_ZVAL(©, zv, 1, 0); - // str = zend_string_dup(Z_STR_P(zv), 0); for (size_t i = 0; i < Z_STRLEN(copy); i++) { if (Z_STRVAL(copy)[i] == '\0') { Z_STRVAL(copy)[i] = '0'; } } - ret = estrdup(Z_STRVAL(copy)); - // zend_string_release(str); - return ret; + return estrdup(Z_STRVAL(copy)); } diff --git a/src/tests/disabled_functions_param_array.phpt b/src/tests/disabled_functions_param_array.phpt index 8fb75e1..5ca13aa 100644 --- a/src/tests/disabled_functions_param_array.phpt +++ b/src/tests/disabled_functions_param_array.phpt @@ -17,23 +17,6 @@ foo($a); $a=Array("a"=>"abcd"); foo($a); -/* - -$a=Array("bla"=>"abcdef"); -foo($a); - -$a=Array("bla"=>"aaa", "a"=>"eee" ); -foo($a); - -$a=Array("test"=>"aaa", "a"=>"fff" ); -foo($a); - -$a=Array("test2"=>Array("foo"=>Array("lol"=>"bbb")), "a"=>"cccc"); -foo($a); - -$a=Array("test2"=>Array("foo"=>Array("lol"=>"aaa")), "a"=>"dddd"); -foo($a); - */ ?> --EXPECTF-- test1 -- cgit v1.3