nlopess Tue Sep 5 13:50:22 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/tidy tidy.c
Log:
remove some leftover code from the time tidy would throw exceptions
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.9&r2=1.66.2.8.2.10&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.9
php-src/ext/tidy/tidy.c:1.66.2.8.2.10
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.9 Thu Aug 31 13:58:31 2006
+++ php-src/ext/tidy/tidy.c Tue Sep 5 13:50:22 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.9 2006/08/31 13:58:31 tony2001 Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.10 2006/09/05 13:50:22 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -223,7 +223,6 @@
static void tidy_object_free_storage(void * TSRMLS_DC);
static zend_object_value tidy_object_new_node(zend_class_entry * TSRMLS_DC);
static zend_object_value tidy_object_new_doc(zend_class_entry * TSRMLS_DC);
-static zend_object_value tidy_object_new_exception(zend_class_entry *
TSRMLS_DC);
static zend_class_entry *tidy_get_ce_node(zval * TSRMLS_DC);
static zend_class_entry *tidy_get_ce_doc(zval * TSRMLS_DC);
static zval * tidy_instanciate(zend_class_entry *, zval * TSRMLS_DC);
@@ -370,7 +369,6 @@
static zend_object_handlers tidy_object_handlers_doc;
static zend_object_handlers tidy_object_handlers_node;
-static zend_object_handlers tidy_object_handlers_exception;
zend_module_entry tidy_module_entry = {
STANDARD_MODULE_HEADER,
@@ -682,13 +680,6 @@
return retval;
}
-static zend_object_value tidy_object_new_exception(zend_class_entry
*class_type TSRMLS_DC)
-{
- zend_object_value retval;
- tidy_object_new(class_type, &tidy_object_handlers_exception, &retval,
is_exception TSRMLS_CC);
- return retval;
-}
-
static zend_class_entry *tidy_get_ce_node(zval *object TSRMLS_DC)
{
return tidy_ce_node;
@@ -1043,7 +1034,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.66.2.8.2.9 2006/08/31 13:58:31
tony2001 Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.10 2006/09/05 13:50:22
nlopess Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1673,34 +1664,6 @@
}
/* }}} */
-/* {{{ proto boolean tidyNode::isXhtml()
- Returns true if this node is part of a XHTML document */
-static TIDY_NODE_METHOD(isXhtml)
-{
- TIDY_FETCH_ONLY_OBJECT;
-
- if (tidyDetectedXhtml(obj->ptdoc->doc)) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto boolean tidyNode::isXml()
- Returns true if this node is part of a XML document */
-static TIDY_NODE_METHOD(isXml)
-{
- TIDY_FETCH_ONLY_OBJECT;
-
- if (tidyDetectedGenericXml(obj->ptdoc->doc)) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
/* {{{ proto boolean tidyNode::isText()
Returns true if this node represents text (no markup) */
static TIDY_NODE_METHOD(isText)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
