iliaa Tue Jan 6 23:46:22 2009 UTC
Modified files:
/php-src/ext/tidy tidy.c
Log:
MFB: Arg parsing cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.129&r2=1.130&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.129 php-src/ext/tidy/tidy.c:1.130
--- php-src/ext/tidy/tidy.c:1.129 Wed Dec 31 11:12:37 2008
+++ php-src/ext/tidy/tidy.c Tue Jan 6 23:46:22 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.129 2008/12/31 11:12:37 sebastian Exp $ */
+/* $Id: tidy.c,v 1.130 2009/01/06 23:46:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -562,7 +562,7 @@
zend_bool use_include_path = 0;
TidyDoc doc;
TidyBuffer *errbuf;
- zval **config;
+ zval **config = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &arg1,
&arg1_len, &config, &enc, &enc_len, &use_include_path) == FAILURE) {
RETURN_FALSE;
@@ -593,7 +593,7 @@
TIDY_SET_DEFAULT_CONFIG(doc);
- if (ZEND_NUM_ARGS() > 1) {
+ if (config) {
TIDY_APPLY_CONFIG_ZVAL(doc, config);
}
@@ -1156,7 +1156,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.129 2008/12/31 11:12:37 sebastian
Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.130 2009/01/06 23:46:22 iliaa Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
