cvs: php4 /ext/domxml php_domxml.c
| From: | Christian Stocker | Date: | Thu, 22 Aug 2002 16:04:31 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13573@lists.php.net to get a copy of this message | ||
chregu Thu Aug 22 12:04:31 2002 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
- moved xslt_dump_ to better place
- removed unused variables
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.201 php4/ext/domxml/php_domxml.c:1.202
--- php4/ext/domxml/php_domxml.c:1.201 Thu Aug 22 11:54:22 2002
+++ php4/ext/domxml/php_domxml.c Thu Aug 22 12:04:28 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.201 2002/08/22 15:54:22 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.202 2002/08/22 16:04:28 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -4176,81 +4176,6 @@
}
/* }}} */
-/* {{{ proto string domxml_xslt_dump_mem(object xslstylesheet, object xmldoc)
- output XSLT result to memory */
-PHP_FUNCTION(domxml_xslt_dump_mem)
-{
- zval *rv, *idxsl, *idxml;
- xsltStylesheetPtr xsltstp;
- xmlDocPtr xmldocp;
- xmlDocPtr docp;
- xmlChar *doc_txt_ptr;
- int doc_txt_len;
- int ret;
-
- DOMXML_GET_THIS(idxsl);
-
- xsltstp = php_xsltstylesheet_get_object(idxsl, le_domxsltstylesheetp, 0 TSRMLS_CC);
- if (!xsltstp) {
- php_error(E_WARNING, "%s(): underlying object missing",
- get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &idxml) == FAILURE) {
- RETURN_FALSE;
- }
-
- DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp);
-
- ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, xmldocp, xsltstp);
-
- if (ret) {
- RETURN_FALSE;
- }
-
- RETURN_STRINGL(doc_txt_ptr, doc_txt_len, 1);
-}
-/* }}} */
-
-/* {{{ proto int domxml_xslt_dump_file(object xslstylesheet, object xmldoc, string filename[, int
compression])
- output XSLT result to File */
-PHP_FUNCTION(domxml_xslt_dump_file)
-{
- zval *rv, *idxsl, *idxml;
- xsltStylesheetPtr xsltstp;
- xmlDocPtr xmldocp;
- xmlDocPtr docp;
- xmlChar *doc_txt_ptr;
- char *filename;
- int doc_txt_len, filename_len;
- int ret, compression = 0;
-
- DOMXML_GET_THIS(idxsl);
-
- xsltstp = php_xsltstylesheet_get_object(idxsl, le_domxsltstylesheetp, 0 TSRMLS_CC);
- if (!xsltstp) {
- php_error(E_WARNING, "%s(): underlying object missing",
- get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "os|l", &idxml, &filename,
&filename_len, &compression) == FAILURE) {
- RETURN_FALSE;
- }
-
- DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp);
-
- ret = xsltSaveResultToFilename(filename, xmldocp, xsltstp, compression);
-
- if (ret) {
- RETURN_FALSE;
- }
-
- RETURN_LONG(ret);
-}
-/* }}} */
-
/* {{{ proto object domxml_parser([string buf[,string filename]])
Creates new xmlparser */
PHP_FUNCTION(domxml_parser)
@@ -5251,6 +5176,78 @@
}
DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
+}
+/* }}} */
+
+/* {{{ proto string domxml_xslt_dump_mem(object xslstylesheet, object xmldoc)
+ output XSLT result to memory */
+PHP_FUNCTION(domxml_xslt_dump_mem)
+{
+ zval *rv, *idxsl, *idxml;
+ xsltStylesheetPtr xsltstp;
+ xmlDocPtr xmldocp;
+ xmlChar *doc_txt_ptr;
+ int doc_txt_len;
+ int ret;
+
+ DOMXML_GET_THIS(idxsl);
+
+ xsltstp = php_xsltstylesheet_get_object(idxsl, le_domxsltstylesheetp, 0 TSRMLS_CC);
+ if (!xsltstp) {
+ php_error(E_WARNING, "%s(): underlying object missing",
+ get_active_function_name(TSRMLS_C));
+ RETURN_FALSE;
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &idxml) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp);
+
+ ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, xmldocp, xsltstp);
+
+ if (ret < 0) {
+ RETURN_FALSE;
+ }
+
+ RETURN_STRINGL(doc_txt_ptr, doc_txt_len, 1);
+}
+/* }}} */
+
+/* {{{ proto int domxml_xslt_dump_file(object xslstylesheet, object xmldoc, string filename[, int
compression])
+ output XSLT result to File */
+PHP_FUNCTION(domxml_xslt_dump_file)
+{
+ zval *rv, *idxsl, *idxml;
+ xsltStylesheetPtr xsltstp;
+ xmlDocPtr xmldocp;
+ char *filename;
+ int filename_len;
+ int ret, compression = 0;
+
+ DOMXML_GET_THIS(idxsl);
+
+ xsltstp = php_xsltstylesheet_get_object(idxsl, le_domxsltstylesheetp, 0 TSRMLS_CC);
+ if (!xsltstp) {
+ php_error(E_WARNING, "%s(): underlying object missing",
+ get_active_function_name(TSRMLS_C));
+ RETURN_FALSE;
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "os|l", &idxml, &filename,
&filename_len, &compression) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp);
+
+ ret = xsltSaveResultToFilename(filename, xmldocp, xsltstp, compression);
+
+ if (ret < 0) {
+ RETURN_FALSE;
+ }
+
+ RETURN_LONG(ret);
}
/* }}} */