com php-src: Fix SOAP warnings: ext/soap/php_encoding.c e xt/soap/php_http.c ext/soap/php_sdl.c
| From: | Nikita Popov | Date: | Fri, 05 Sep 2014 09:20:06 +0000 |
| Subject: | com php-src: Fix SOAP warnings: ext/soap/php_encoding.c e xt/soap/php_http.c ext/soap/php_sdl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81434@lists.php.net to get a copy of this message | ||
Commit: c7206771628c2119eb10444148e936265971ca33
Author: Nikita Popov <nikic@php.net> Thu, 4 Sep 2014 22:49:56 +0200
Parents: 8002e2c06a58e7fbe3f6d47ee9602c85d45c12b0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7206771628c2119eb10444148e936265971ca33
Log:
Fix SOAP warnings
Changed paths:
M ext/soap/php_encoding.c
M ext/soap/php_http.c
M ext/soap/php_sdl.c
Diff:
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index e04a0dd..802a077 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -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")) &&
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index db8d0b7..d1fd2d5 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -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, "=");
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 456fe59..587695b 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -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) {