cvs: php-src /ext/soap php_schema.c php_schema.h php_sdl.c php_xml.c php_xml.h

dmitry Tue Aug 2 07:15:44 2005 EDT Modified files: /php-src/ext/soap php_schema.c php_schema.h php_sdl.c php_xml.c php_xml.h Log: Fixed ZTS build http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.c?r1=1.56&r2=1.57&ty=u Index: php-src/ext/soap/php_schema.c diff -u php-src/ext/soap/php_schema.c:1.56 php-src/ext/soap/php_schema.c:1.57 --- php-src/ext/soap/php_schema.c:1.56 Wed Jun 1 10:43:13 2005 +++ php-src/ext/soap/php_schema.c Tue Aug 2 07:15:41 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_schema.c,v 1.56 2005/06/01 14:43:13 dmitry Exp $ */ +/* $Id: php_schema.c,v 1.57 2005/08/02 11:15:41 dmitry Exp $ */ #include "php_soap.h" #include "libxml/uri.h" @@ -95,14 +95,14 @@ 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 @@ } } 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 @@ 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 @@ 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 @@ 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 @@ 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 */ http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.h?r1=1.11&r2=1.12&ty=u Index: php-src/ext/soap/php_schema.h diff -u php-src/ext/soap/php_schema.h:1.11 php-src/ext/soap/php_schema.h:1.12 --- php-src/ext/soap/php_schema.h:1.11 Tue Feb 10 08:41:21 2004 +++ php-src/ext/soap/php_schema.h Tue Aug 2 07:15:41 2005 @@ -17,12 +17,12 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_schema.h,v 1.11 2004/02/10 13:41:21 dmitry Exp $ */ +/* $Id: php_schema.h,v 1.12 2005/08/02 11:15:41 dmitry Exp $ */ #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); http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.86&r2=1.87&ty=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.86 php-src/ext/soap/php_sdl.c:1.87 --- php-src/ext/soap/php_sdl.c:1.86 Wed Jul 20 06:21:49 2005 +++ php-src/ext/soap/php_sdl.c Tue Aug 2 07:15:41 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_sdl.c,v 1.86 2005/07/20 10:21:49 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.87 2005/08/02 11:15:41 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -211,7 +211,7 @@ 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 @@ 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 @@ 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); } http://cvs.php.net/diff.php/php-src/ext/soap/php_xml.c?r1=1.23&r2=1.24&ty=u Index: php-src/ext/soap/php_xml.c diff -u php-src/ext/soap/php_xml.c:1.23 php-src/ext/soap/php_xml.c:1.24 --- php-src/ext/soap/php_xml.c:1.23 Mon Aug 1 07:38:02 2005 +++ php-src/ext/soap/php_xml.c Tue Aug 2 07:15:41 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_xml.c,v 1.23 2005/08/01 11:38:02 dmitry Exp $ */ +/* $Id: php_xml.c,v 1.24 2005/08/02 11:15:41 dmitry Exp $ */ #include "php_soap.h" #include "libxml/parser.h" @@ -76,7 +76,7 @@ { } -xmlDocPtr soap_xmlParseFile(const char *filename) +xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) { xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; http://cvs.php.net/diff.php/php-src/ext/soap/php_xml.h?r1=1.15&r2=1.16&ty=u Index: php-src/ext/soap/php_xml.h diff -u php-src/ext/soap/php_xml.h:1.15 php-src/ext/soap/php_xml.h:1.16 --- php-src/ext/soap/php_xml.h:1.15 Fri Feb 6 03:01:35 2004 +++ php-src/ext/soap/php_xml.h Tue Aug 2 07:15:42 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_xml.h,v 1.15 2004/02/06 08:01:35 dmitry Exp $ */ +/* $Id: php_xml.h,v 1.16 2005/08/02 11:15:42 dmitry Exp $ */ #ifndef PHP_SOAP_XML_H #define PHP_SOAP_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);