nlopess Fri May 4 17:45:56 2007 UTC
Modified files:
/php-src/ext/tidy tidy.c
/php-src/ext/tidy/tests 007.phpt
Log:
use the new 's&' parameter type and simplify the code
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.112&r2=1.113&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.112 php-src/ext/tidy/tidy.c:1.113
--- php-src/ext/tidy/tidy.c:1.112 Thu Feb 8 16:37:52 2007
+++ php-src/ext/tidy/tidy.c Fri May 4 17:45:56 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.112 2007/02/08 16:37:52 nlopess Exp $ */
+/* $Id: tidy.c,v 1.113 2007/05/04 17:45:56 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1056,7 +1056,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.112 2007/02/08 16:37:52 nlopess Exp
$)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.113 2007/05/04 17:45:56 nlopess Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1173,38 +1173,27 @@
Parse a document stored in a string */
static PHP_FUNCTION(tidy_parse_string)
{
- zstr input, enc = NULL_ZSTR;
- zend_uchar input_type, enc_type = IS_STRING;
+ zstr input;
+ char *enc = NULL;
+ zend_uchar input_type;
int input_len, enc_len;
zval **options = NULL;
PHPTidyObj *obj;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|Zt", &input,
&input_len, &input_type, &options, &enc, &enc_len, &enc_type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|Zs&", &input,
&input_len, &input_type, &options, &enc, &enc_len, UG(ascii_conv)) == FAILURE) {
RETURN_FALSE;
}
- if (enc_type != IS_STRING) {
- enc.s = zend_unicode_to_ascii(enc.u, enc_len TSRMLS_CC);
- if (!enc.s) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received");
- RETURN_FALSE;
- }
- }
-
tidy_instanciate(tidy_ce_doc, return_value TSRMLS_CC);
obj = (PHPTidyObj *) zend_object_store_get_object(return_value
TSRMLS_CC);
TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options);
- if (php_tidy_parse_string(obj, input.s, input_len, enc.s TSRMLS_CC) ==
FAILURE) {
+ if (php_tidy_parse_string(obj, input.s, input_len, enc TSRMLS_CC) ==
FAILURE) {
zval_dtor(return_value);
INIT_ZVAL(*return_value);
RETVAL_FALSE;
}
-
- if (enc_type != IS_STRING) {
- efree(enc.s);
- }
}
/* }}} */
@@ -1339,48 +1328,31 @@
static PHP_FUNCTION(tidy_get_opt_doc)
{
PHPTidyObj *obj;
- char *optval;
- zstr optname;
- zend_uchar optname_type;
+ char *optval, *optname;
int optname_len;
TidyOption opt;
TIDY_SET_CONTEXT;
if (object) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t",
&optname, &optname_len, &optname_type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&",
&optname, &optname_len, UG(ascii_conv)) == FAILURE) {
RETURN_FALSE;
}
} else {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
NULL, "Ot", &object, tidy_ce_doc, &optname, &optname_len, &optname_type) ==
FAILURE) {
- RETURN_FALSE;
- }
- }
-
- if (optname_type != IS_STRING) {
- optname.s = zend_unicode_to_ascii(optname.u, optname_len
TSRMLS_CC);
- if (!optname.s) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received");
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
NULL, "Os&", &object, tidy_ce_doc, &optname, &optname_len, UG(ascii_conv)) ==
FAILURE) {
RETURN_FALSE;
}
}
obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
- opt = tidyGetOptionByName(obj->ptdoc->doc, optname.s);
+ opt = tidyGetOptionByName(obj->ptdoc->doc, optname);
if (!opt) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown Tidy
Configuration Option '%s'", optname.s);
- if (optname_type != IS_STRING) {
- efree(optname.s);
- }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown Tidy
Configuration Option '%s'", optname);
RETURN_FALSE;
}
- if (optname_type != IS_STRING) {
- efree(optname.s);
- }
-
if ( (optval = (char *) tidyOptGetDoc(obj->ptdoc->doc, opt)) ) {
RETURN_ASCII_STRING(optval, 1);
}
@@ -1515,49 +1487,32 @@
static PHP_FUNCTION(tidy_getopt)
{
PHPTidyObj *obj;
- zstr optname;
- void *optval;
+ void *optval, *optname;
int optname_len;
TidyOption opt;
TidyOptionType optt;
- zend_uchar optname_type;
TIDY_SET_CONTEXT;
if (object) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t",
&optname, &optname_len, &optname_type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&",
&optname, &optname_len, UG(ascii_conv)) == FAILURE) {
RETURN_FALSE;
}
} else {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
NULL, "Ot", &object, tidy_ce_doc, &optname, &optname_len, &optname_type) ==
FAILURE) {
- RETURN_FALSE;
- }
- }
-
- if (optname_type != IS_STRING) {
- optname.s = zend_unicode_to_ascii(optname.u, optname_len
TSRMLS_CC);
- if (!optname.s) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received");
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
NULL, "Os&", &object, tidy_ce_doc, &optname, &optname_len, UG(ascii_conv)) ==
FAILURE) {
RETURN_FALSE;
}
}
obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
- opt = tidyGetOptionByName(obj->ptdoc->doc, optname.s);
+ opt = tidyGetOptionByName(obj->ptdoc->doc, optname);
if (!opt) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown Tidy
Configuration Option '%s'", optname.s);
- if (optname_type != IS_STRING) {
- efree(optname.s);
- }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown Tidy
Configuration Option '%s'", optname);
RETURN_FALSE;
}
- if (optname_type != IS_STRING) {
- efree(optname.s);
- }
-
optval = php_tidy_get_opt_val(obj->ptdoc, opt, &optt TSRMLS_CC);
switch (optt) {
case TidyString:
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/007.phpt?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/tidy/tests/007.phpt
diff -u php-src/ext/tidy/tests/007.phpt:1.12
php-src/ext/tidy/tests/007.phpt:1.13
--- php-src/ext/tidy/tests/007.phpt:1.12 Thu Feb 8 16:37:52 2007
+++ php-src/ext/tidy/tests/007.phpt Fri May 4 17:45:56 2007
@@ -36,5 +36,5 @@
Warning: tidy::getOpt(): Unknown Tidy Configuration Option 'bogus-opt' in
%s007.php on line 10
bool(false)
-Warning: tidy_getopt(): Binary or ASCII-Unicode string expected,
non-ASCII-Unicode string received in %s007.php on line 11
+Warning: Could not convert Unicode string to binary string (converter US-ASCII
failed on character {U+00E0} at offset 17) in %s007.php on line 11
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
