From 4fe9395678ea27d46d1c8f74a24cb10de43a11ee Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 21:12:31 +0200 Subject: cleanup TSRMLS_FETCH in ext/soap --- ext/soap/php_xml.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ext/soap/php_xml.c') diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 5ad5548c40..d59a65f182 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -133,8 +133,6 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; - TSRMLS_FETCH(); - /* xmlInitParser(); */ -- cgit v1.2.1 From c00424e427930a33e6d8645cc3f23fb78ed29b9f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 15 Oct 2014 09:37:55 +0200 Subject: bring back all the TSRMLS_FETCH() stuff for better comparability with the mainstream --- ext/soap/php_xml.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ext/soap/php_xml.c') diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index d59a65f182..5ad5548c40 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -133,6 +133,8 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; + TSRMLS_FETCH(); + /* xmlInitParser(); */ -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/soap/php_xml.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ext/soap/php_xml.c') diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 5ad5548c40..de79c07a30 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -77,7 +77,7 @@ static void soap_Comment(void *ctx, const xmlChar *value) { } -xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) +xmlDocPtr soap_xmlParseFile(const char *filename) { xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; @@ -100,9 +100,9 @@ xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) ctxt->sax->warning = NULL; ctxt->sax->error = NULL; /*ctxt->sax->fatalError = NULL;*/ - old = php_libxml_disable_entity_loader(1 TSRMLS_CC); + old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); - php_libxml_disable_entity_loader(old TSRMLS_CC); + php_libxml_disable_entity_loader(old); if (ctxt->wellFormed) { ret = ctxt->myDoc; if (ret->URL == NULL && ctxt->directory != NULL) { @@ -133,7 +133,6 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; - TSRMLS_FETCH(); /* xmlInitParser(); @@ -150,9 +149,9 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) #if LIBXML_VERSION >= 20703 ctxt->options |= XML_PARSE_HUGE; #endif - old = php_libxml_disable_entity_loader(1 TSRMLS_CC); + old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); - php_libxml_disable_entity_loader(old TSRMLS_CC); + php_libxml_disable_entity_loader(old); if (ctxt->wellFormed) { ret = ctxt->myDoc; if (ret->URL == NULL && ctxt->directory != NULL) { -- cgit v1.2.1