]> granicus.if.org Git - php/commitdiff
Fix SOAP warnings
authorNikita Popov <nikic@php.net>
Thu, 4 Sep 2014 20:49:56 +0000 (22:49 +0200)
committerNikita Popov <nikic@php.net>
Fri, 5 Sep 2014 09:20:06 +0000 (11:20 +0200)
ext/soap/php_encoding.c
ext/soap/php_http.c
ext/soap/php_sdl.c

index e04a0dda2cd3531f99407aab75bc2a94c63df151..802a0773cbfbe3caa0d55c778bb19ca0a0a8bc1c 100644 (file)
@@ -1717,7 +1717,6 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
                }
                case XSD_CONTENT_ANY: {
                        zval *data;
-                       xmlNodePtr property;
                        encodePtr enc;
                        zval rv;
 
@@ -1731,10 +1730,10 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
                                        zval *val;
 
                                        ZEND_HASH_FOREACH_VAL(ht, val) {
-                                               property = master_to_xml(enc, val, style, node TSRMLS_CC);
+                                               master_to_xml(enc, val, style, node TSRMLS_CC);
                                        } ZEND_HASH_FOREACH_END();
                                } else {
-                                       property = master_to_xml(enc, data, style, node TSRMLS_CC);
+                                       master_to_xml(enc, data, style, node TSRMLS_CC);
                                }
                                return 1;
                        } else if (model->min_occurs == 0) {
@@ -2485,14 +2484,12 @@ static zval *to_zval_array(zval *ret, encodeTypePtr type, xmlNodePtr data TSRMLS
        int* dims = NULL;
        int* pos = NULL;
        xmlAttrPtr attr;
-       sdlPtr sdl;
        sdlAttributePtr arrayType;
        sdlExtraAttributePtr ext;
        sdlTypePtr elementType;
 
        ZVAL_NULL(ret);
        FIND_XML_NULL(data, ret);
-       sdl = SOAP_GLOBAL(sdl);
 
        if (data &&
            (attr = get_attribute(data->properties,"arrayType")) &&
index db8d0b79d60a89e11d10abf3c58ddaa42f882814..d1fd2d51aeeda6dfa2014d15c623032ea80e952d 100644 (file)
@@ -930,7 +930,7 @@ try_again:
        */
        cookie_itt = strstr(http_headers->val, "Set-Cookie: ");
        while (cookie_itt) {
-               char *end_pos, *cookie;
+               char *cookie;
                char *eqpos, *sempos;
                zval *cookies;
 
@@ -940,7 +940,6 @@ try_again:
                        cookies = zend_hash_str_update(Z_OBJPROP_P(this_ptr), "_cookies", sizeof("_cookies")-1, &tmp_cookies);
                }
 
-               end_pos = strstr(cookie_itt,"\r\n");
                cookie = get_http_header_value(cookie_itt,"Set-Cookie: ");
 
                eqpos = strstr(cookie, "=");
index 456fe59584585e08275c36e566c0b8511775d70f..587695b94306bda1c3bf80f03c3e4341d613aef8 100644 (file)
@@ -975,7 +975,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC)
 
                                        input = get_node_ex(portTypeOperation->children, "input", WSDL_NAMESPACE);
                                        if (input != NULL) {
-                                               xmlAttrPtr message, name;
+                                               xmlAttrPtr message;
 
                                                message = get_attribute(input->properties, "message");
                                                if (message == NULL) {
@@ -983,8 +983,8 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC)
                                                }
                                                function->requestParameters = wsdl_message(&ctx, message->children->content);
 
-                                               name = get_attribute(input->properties, "name");
 /* FIXME
+                                               xmlAttrPtr name = get_attribute(input->properties, "name");
                                                if (name != NULL) {
                                                        function->requestName = estrdup(name->children->content);
                                                } else {
@@ -1004,7 +1004,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC)
 
                                        output = get_node_ex(portTypeOperation->children, "output", WSDL_NAMESPACE);
                                        if (output != NULL) {
-                                               xmlAttrPtr message, name;
+                                               xmlAttrPtr message;
 
                                                message = get_attribute(output->properties, "message");
                                                if (message == NULL) {
@@ -1012,8 +1012,8 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC)
                                                }
                                                function->responseParameters = wsdl_message(&ctx, message->children->content);
 
-                                               name = get_attribute(output->properties, "name");
 /* FIXME
+                                               xmlAttrPtr name = get_attribute(output->properties, "name");
                                                if (name != NULL) {
                                                        function->responseName = estrdup(name->children->content);
                                                } else if (input == NULL) {