com php-src: Cleanup (removed dead code): ext/simplexml/simplexml.c ext/soap/php_encoding.c ext/soap/php_sdl.c ext/soap /soap.c

Commit: 6daed13c8bc29391e6a9f8c4692a69e13ac8c085 Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Jul 2015 22:18:40 +0300 Parents: b4db4114c599682ce549cd74d2d157385e085146 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6daed13c8bc29391e6a9f8c4692a69e13ac8c085 Log: Cleanup (removed dead code) Changed paths: M ext/simplexml/simplexml.c M ext/soap/php_encoding.c M ext/soap/php_sdl.c M ext/soap/soap.c Diff: diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 76fcfda..6fe6b94 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -527,9 +527,7 @@ static int sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_bool break; case IS_OBJECT: if (Z_OBJCE_P(value) == sxe_class_entry) { - //??? value = sxe_get_value(value, &zval_copy); - //INIT_PZVAL(value); new_value = 1; break; } @@ -704,7 +702,6 @@ static zval *sxe_property_get_adr(zval *object, zval *member, int fetch_type, vo } ZVAL_COPY_VALUE(&sxe->tmp, &ret); - //???? Z_SET_ISREF_P(return_value); return &sxe->tmp; } @@ -1836,8 +1833,6 @@ static int cast_object(zval *object, int type, char *contents) } else { ZVAL_NULL(object); } - //???? Z_SET_REFCOUNT_P(object, 1); - //Z_UNSET_ISREF_P(object); switch (type) { case IS_STRING: diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 21786c6..5d8bf95 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2318,7 +2318,6 @@ iterator_done: dims = safe_emalloc(sizeof(int), dimension, 0); dims[0] = i; - //??? el = &data; el = data; for (i = 1; i < dimension; i++) { if (el != NULL && Z_TYPE_P(el) == IS_ARRAY && diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 32c38a5..14d690f 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -3085,7 +3085,6 @@ static sdlPtr make_persistent_sdl(sdlPtr sdl) if ((preq = zend_hash_str_find_ptr(&ptr_map, (char*)&tmp, sizeof(tmp))) == NULL) { assert(0); } - //??? Z_PTR_P(zv) = preq; if (key) { /* We have to duplicate key emalloc->malloc */ diff --git a/ext/soap/soap.c b/ext/soap/soap.c index ab9f4ff..ca3b79b 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -541,7 +541,6 @@ static void php_soap_prepare_globals() zend_hash_init(&defEnc, 0, NULL, NULL, 1); zend_hash_init(&defEncIndex, 0, NULL, NULL, 1); zend_hash_init(&defEncNs, 0, NULL, NULL, 1); -//??? defEncNs.flags |= HASH_FLAG_BIG_DATA; i = 0; do { @@ -1822,12 +1821,10 @@ PHP_METHOD(SoapServer, handle) } if (Z_TYPE(h->retval) == IS_OBJECT && instanceof_function(Z_OBJCE(h->retval), soap_fault_class_entry)) { -//??? zval *headerfault = NULL; zval *tmp; if ((tmp = zend_hash_str_find(Z_OBJPROP(h->retval), "headerfault", sizeof("headerfault")-1)) != NULL && Z_TYPE_P(tmp) != IS_NULL) { -//??? headerfault = tmp; } php_output_discard(); soap_server_fault_ex(function, &h->retval, h); @@ -2158,15 +2155,12 @@ static void soap_error_handler(int error_num, const char *error_filename, const char* code = SOAP_GLOBAL(error_code); char buffer[1024]; int buffer_len; -//??? zval outbuf, outbuflen; #ifdef va_copy va_list argcopy; #endif zend_object **old_objects; int old = PG(display_errors); -//??? INIT_ZVAL(outbuf); -//??? INIT_ZVAL(outbuflen); #ifdef va_copy va_copy(argcopy, args); buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, argcopy); @@ -2244,8 +2238,6 @@ static void soap_error_handler(int error_num, const char *error_filename, const int buffer_len; zval outbuflen; -//??? INIT_ZVAL(outbuflen); - #ifdef va_copy va_copy(argcopy, args); buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, argcopy); @@ -2464,12 +2456,6 @@ PHP_METHOD(SoapClient, SoapClient) } if ((tmp = zend_hash_str_find(ht, "classmap", sizeof("classmap")-1)) != NULL && Z_TYPE_P(tmp) == IS_ARRAY) { -//??? zval *class_map; -//??? -//??? MAKE_STD_ZVAL(class_map); -//??? MAKE_COPY_ZVAL(tmp, class_map); -//??? Z_DELREF_P(class_map); -//??? add_property_zval(this_ptr, "_classmap", tmp); } @@ -3825,7 +3811,6 @@ static int serialize_response_call2(xmlNodePtr body, sdlFunctionPtr function, ch zval *data; int i = 0; zend_string *param_name; -//??? zend_ulong param_index = i; ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(ret), param_index, param_name, data) {