summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2005-08-02 11:15:42 +0000
committerDmitry Stogov <dmitry@php.net>2005-08-02 11:15:42 +0000
commitc9571d77863433525b7a0e046fbeb3a89b790bca (patch)
tree63c43e4bea8ad2929c8fa0b20a8532624a29659b
parent71df2059078214e3ac599f73a4d2ff71a8b67f8e (diff)
downloadphp-git-c9571d77863433525b7a0e046fbeb3a89b790bca.tar.gz
Fixed ZTS build
-rw-r--r--ext/soap/php_schema.c14
-rw-r--r--ext/soap/php_schema.h2
-rw-r--r--ext/soap/php_sdl.c6
-rw-r--r--ext/soap/php_xml.c2
-rw-r--r--ext/soap/php_xml.h2
5 files changed, 13 insertions, 13 deletions
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
index 10119a45de..1e735bf91e 100644
--- a/ext/soap/php_schema.c
+++ b/ext/soap/php_schema.c
@@ -95,14 +95,14 @@ static encodePtr get_create_encoder(sdlPtr sdl, sdlTypePtr cur_type, const char
return enc;
}
-static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlAttrPtr tns, int import) {
+static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlAttrPtr tns, int import TSRMLS_DC) {
if (location != NULL &&
!zend_hash_exists(&ctx->docs, location, strlen(location)+1)) {
xmlDocPtr doc;
xmlNodePtr schema;
xmlAttrPtr new_tns;
- doc = soap_xmlParseFile(location);
+ doc = soap_xmlParseFile(location TSRMLS_CC);
if (doc == NULL) {
soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s'", location);
}
@@ -133,7 +133,7 @@ static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlA
}
}
zend_hash_add(&ctx->docs, location, strlen(location)+1, (void**)&doc, sizeof(xmlDocPtr), NULL);
- load_schema(ctx, schema);
+ load_schema(ctx, schema TSRMLS_CC);
}
}
@@ -157,7 +157,7 @@ static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlA
Content: ((include | import | redefine | annotation)*, (((simpleType | complexType | group | attributeGroup) | element | attribute | notation), annotation*)*)
</schema>
*/
-int load_schema(sdlCtx *ctx,xmlNodePtr schema)
+int load_schema(sdlCtx *ctx, xmlNodePtr schema TSRMLS_DC)
{
xmlNodePtr trav;
xmlAttrPtr tns;
@@ -199,7 +199,7 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
uri = xmlBuildURI(location->children->content, base);
xmlFree(base);
}
- schema_load_file(ctx,NULL,uri,tns,0);
+ schema_load_file(ctx, NULL, uri, tns, 0 TSRMLS_CC);
xmlFree(uri);
}
@@ -219,7 +219,7 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
uri = xmlBuildURI(location->children->content, base);
xmlFree(base);
}
- schema_load_file(ctx,NULL,uri,tns,0);
+ schema_load_file(ctx, NULL, uri, tns, 0 TSRMLS_CC);
xmlFree(uri);
/* TODO: <redefine> support */
}
@@ -244,7 +244,7 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
xmlFree(base);
}
}
- schema_load_file(ctx,ns,uri,tns,1);
+ schema_load_file(ctx, ns, uri, tns, 1 TSRMLS_CC);
if (uri != NULL) {xmlFree(uri);}
} else if (node_is_equal(trav,"annotation")) {
/* TODO: <annotation> support */
diff --git a/ext/soap/php_schema.h b/ext/soap/php_schema.h
index 9101725df3..25d098ad1c 100644
--- a/ext/soap/php_schema.h
+++ b/ext/soap/php_schema.h
@@ -22,7 +22,7 @@
#ifndef PHP_SCHEMA_H
#define PHP_SCHEMA_H
-int load_schema(sdlCtx *ctx, xmlNodePtr schema);
+int load_schema(sdlCtx *ctx, xmlNodePtr schema TSRMLS_DC);
void schema_pass2(sdlCtx *ctx);
void delete_model(void *handle);
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 4699a585e6..2a45a430ea 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -211,7 +211,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include
return;
}
- wsdl = soap_xmlParseFile(struri);
+ wsdl = soap_xmlParseFile(struri TSRMLS_CC);
if (!wsdl) {
soap_error1(E_ERROR, "Parsing WSDL: Couldn't load from '%s'", struri);
@@ -225,7 +225,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include
if (include) {
xmlNodePtr schema = get_node_ex(root, "schema", XSD_NAMESPACE);
if (schema) {
- load_schema(ctx, schema);
+ load_schema(ctx, schema TSRMLS_CC);
return;
}
}
@@ -251,7 +251,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include
while (trav2 != NULL) {
if (node_is_equal_ex(trav2, "schema", XSD_NAMESPACE)) {
- load_schema(ctx, trav2);
+ load_schema(ctx, trav2 TSRMLS_CC);
} else if (is_wsdl_element(trav2) && !node_is_equal(trav2,"documentation")) {
soap_error1(E_ERROR, "Parsing WSDL: Unexpected WSDL element <%s>", trav2->name);
}
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c
index 73035ee56c..c6992fc05a 100644
--- a/ext/soap/php_xml.c
+++ b/ext/soap/php_xml.c
@@ -76,7 +76,7 @@ static void soap_Comment(void *ctx, const xmlChar *value)
{
}
-xmlDocPtr soap_xmlParseFile(const char *filename)
+xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC)
{
xmlParserCtxtPtr ctxt = NULL;
xmlDocPtr ret;
diff --git a/ext/soap/php_xml.h b/ext/soap/php_xml.h
index dfb31ffad2..8150e2a56a 100644
--- a/ext/soap/php_xml.h
+++ b/ext/soap/php_xml.h
@@ -30,7 +30,7 @@
#define node_is_equal(node, name) node_is_equal_ex(node, name, NULL)
#define attr_is_equal(node, name) attr_is_equal_ex(node, name, NULL)
-xmlDocPtr soap_xmlParseFile(const char *filename);
+xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC);
xmlDocPtr soap_xmlParseMemory(const void *buf, size_t size);
xmlNsPtr attr_find_ns(xmlAttrPtr node);