tony2001Sat Oct 6 21:28:10 2007 UTC
Modified files:
/php-src/ext/xslxsl_fe.h xsltprocessor.c
Log:
fix ws folding, nuke unused vars
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsl_fe.h?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/xsl/xsl_fe.h
diff -u php-src/ext/xsl/xsl_fe.h:1.13 php-src/ext/xsl/xsl_fe.h:1.14
--- php-src/ext/xsl/xsl_fe.h:1.13 Tue Oct 2 06:32:16 2007
+++ php-src/ext/xsl/xsl_fe.hSat Oct 6 21:28:10 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xsl_fe.h,v 1.13 2007/10/02 06:32:16 chregu Exp $ */
+/* $Id: xsl_fe.h,v 1.14 2007/10/06 21:28:10 tony2001 Exp $ */
#ifndef XSL_FE_H
#define XSL_FE_H
@@ -35,3 +35,12 @@
PHP_FUNCTION(xsl_xsltprocessor_register_php_functions);
PHP_FUNCTION(xsl_xsltprocessor_set_profiling);
#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim600: sw=4 ts=4
+ */
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.58r2=1.59diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.58
php-src/ext/xsl/xsltprocessor.c:1.59
--- php-src/ext/xsl/xsltprocessor.c:1.58Tue Oct 2 06:32:16 2007
+++ php-src/ext/xsl/xsltprocessor.c Sat Oct 6 21:28:10 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.58 2007/10/02 06:32:16 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.59 2007/10/06 21:28:10 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -48,7 +48,6 @@
{NULL, NULL, NULL}
};
-/* {{{ attribute protos, not implemented yet */
/* {{{ php_xsl_xslt_string_to_xpathexpr()
Translates a string to a XPath Expression */
static char *php_xsl_xslt_string_to_xpathexpr(const char *str TSRMLS_DC)
@@ -73,7 +72,7 @@
}
return (char *) value;
}
-
+/* }}} */
/* {{{ php_xsl_xslt_make_params()
Translates a PHP array to a libxslt parameters array */
@@ -124,8 +123,7 @@
}
/* }}} */
-
-static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int
type)
+static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int
type) /* {{{ */
{
xsltTransformContextPtr tctxt;
zval **args;
@@ -315,17 +313,19 @@
efree(fci.params);
}
}
+/* }}} */
-void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) /*
{{{ */
{
xsl_ext_function_php(ctxt, nargs, 1);
}
+/* }}} */
-void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /*
{{{ */
{
xsl_ext_function_php(ctxt, nargs, 2);
}
-
+/* }}} */
/* {{{ proto void xsl_xsltprocessor_import_stylesheet(domdocument doc) U
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -414,8 +414,7 @@
}
/* }}} end xsl_xsltprocessor_import_stylesheet */
-
-static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern,
xsltStylesheetPtr style, zval *docp TSRMLS_DC)
+static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern,
xsltStylesheetPtr style, zval *docp TSRMLS_DC) /* {{{ */
{
xmlDocPtr newdocp;
xmlDocPtr doc = NULL;
@@ -514,6 +513,7 @@
return newdocp;
}
+/* }}} */
/* {{{ proto domdocument xsl_xsltprocessor_transform_to_doc(domnode doc) U
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -575,7 +575,6 @@
}
/* }}} end xsl_xsltprocessor_transform_to_doc */
-
/* {{{ proto int xsl_xsltprocessor_transform_to_uri(domdocument doc, string
uri) U
*/
PHP_FUNCTION(xsl_xsltprocessor_transform_to_uri)
@@ -617,7 +616,6 @@
}
/* }}} end xsl_xsltprocessor_transform_to_uri */
-
/* {{{ proto string xsl_xsltprocessor_transform_to_xml(domdocument doc) U
*/
PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
@@ -656,7 +654,6 @@
}
/* }}} end xsl_xsltprocessor_transform_to_xml */
-
/* {{{ proto bool xsl_xsltprocessor_set_parameter(string namespace, mixed name
[, string value]) U
*/
PHP_FUNCTION(xsl_xsltprocessor_set_parameter)
@@ -825,9 +822,7 @@
/* {{{ proto bool xsl_xsltprocessor_set_profiling(string filename) */
PHP_FUNCTION(xsl_xsltprocessor_set_profiling)
{
-
zval *id;
- zval *array_value, **entry, *new_string;
xsl_object *intern;
char *filename;
int filename_len;
@@ -835,15 +830,11 @@
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, s, filename, filename_len) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
-
intern-profiling = estrndup(filename,filename_len);
-
RETURN_TRUE;
-
