nlopess Fri Sep 15 14:43:08 2006 UTC
Modified files:
/php-src/ext/tidy php_tidy.h tidy.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/php_tidy.h?r1=1.33&r2=1.34&diff_format=u
Index: php-src/ext/tidy/php_tidy.h
diff -u php-src/ext/tidy/php_tidy.h:1.33 php-src/ext/tidy/php_tidy.h:1.34
--- php-src/ext/tidy/php_tidy.h:1.33 Wed Sep 6 17:55:09 2006
+++ php-src/ext/tidy/php_tidy.h Fri Sep 15 14:43:08 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_tidy.h,v 1.33 2006/09/06 17:55:09 mike Exp $ */
+/* $Id: php_tidy.h,v 1.34 2006/09/15 14:43:08 nlopess Exp $ */
#ifndef PHP_TIDY_H
#define PHP_TIDY_H
@@ -24,12 +24,6 @@
extern zend_module_entry tidy_module_entry;
#define phpext_tidy_ptr &tidy_module_entry
-#ifdef PHP_WIN32
-#define PHP_TIDY_API __declspec(dllexport)
-#else
-#define PHP_TIDY_API
-#endif
-
#define TIDY_METHOD_MAP(name, func_name, arg_types) \
ZEND_NAMED_FE(name, ZEND_FN(func_name), arg_types)
#define TIDY_NODE_METHOD(name) PHP_FUNCTION(tnm_ ##name)
@@ -41,7 +35,6 @@
ZEND_BEGIN_MODULE_GLOBALS(tidy)
char *default_config;
- zval *inst;
zend_bool clean_output;
ZEND_END_MODULE_GLOBALS(tidy)
@@ -53,7 +46,6 @@
#endif
-
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.99 php-src/ext/tidy/tidy.c:1.100
--- php-src/ext/tidy/tidy.c:1.99 Thu Sep 7 14:54:28 2006
+++ php-src/ext/tidy/tidy.c Fri Sep 15 14:43:08 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.99 2006/09/07 14:54:28 mike Exp $ */
+/* $Id: tidy.c,v 1.100 2006/09/15 14:43:08 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -42,20 +42,11 @@
/* {{{ ext/tidy macros
*/
-#define REMOVE_NEWLINE(_z) _z->value.str.val[_z->value.str.len-1] = '\0';
_z->value.str.len--;
#define FIX_BUFFER(bptr) (bptr)->bp[(bptr)->size-1] = '\0'
-#define TIDYDOC_FROM_OBJECT(tdoc, object) \
- { \
- PHPTidyObj *obj = (PHPTidyObj*)
zend_object_store_get_object(object TSRMLS_CC); \
- tdoc = obj->ptdoc; \
- }
-
#define TIDY_SET_CONTEXT \
- zval *object; \
- TG(inst) = getThis(); \
- object = TG(inst)
-
+ zval *object = getThis();
+
#define TIDY_FETCH_OBJECT \
PHPTidyObj *obj; \
TIDY_SET_CONTEXT; \
@@ -78,9 +69,6 @@
} \
obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
\
-
-#define Z_OBJ_P(zval_p) zend_objects_get_address(zval_p TSRMLS_CC)
-
#define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \
if(_val) { \
if(Z_TYPE_PP(_val) == IS_ARRAY) { \
@@ -189,8 +177,7 @@
typedef enum {
is_node,
- is_doc,
- is_exception
+ is_doc
} tidy_obj_type;
typedef enum {
@@ -781,8 +768,8 @@
ADD_PROPERTY_STRING(obj->std.properties, name,
tidyNodeGetName(obj->node));
ADD_PROPERTY_LONG(obj->std.properties, type,
tidyNodeGetType(obj->node));
ADD_PROPERTY_LONG(obj->std.properties, line,
tidyNodeLine(obj->node));
- ADD_PROPERTY_LONG(obj->std.properties, column,
tidyNodeColumn(obj->node));
- ADD_PROPERTY_BOOL(obj->std.properties, proprietary,
tidyNodeIsProp(obj->ptdoc->doc, obj->node));
+ ADD_PROPERTY_LONG(obj->std.properties, column,
tidyNodeColumn(obj->node));
+ ADD_PROPERTY_BOOL(obj->std.properties, proprietary,
tidyNodeIsProp(obj->ptdoc->doc, obj->node));
switch(tidyNodeGetType(obj->node)) {
case TidyNode_Root:
@@ -846,7 +833,6 @@
ADD_PROPERTY_NULL(obj->std.properties, value);
break;
- case is_exception:
default:
break;
}
@@ -1028,7 +1014,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.99 2006/09/07 14:54:28 mike Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.100 2006/09/15 14:43:08 nlopess Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1151,8 +1137,6 @@
PHPTidyObj *obj;
- TIDY_SET_CONTEXT;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zs", &input,
&input_len, &options, &enc, &enc_len) == FAILURE) {
RETURN_FALSE;
}
@@ -1210,7 +1194,6 @@
zval **options = NULL;
PHPTidyObj *obj;
- TIDY_SET_CONTEXT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb",
&inputfile, &input_len,
&options, &enc,
&enc_len, &use_include_path) == FAILURE) {
@@ -1256,7 +1239,6 @@
Repair a string using an optionally provided configuration file */
static PHP_FUNCTION(tidy_repair_string)
{
- TIDY_SET_CONTEXT;
php_tidy_quick_repair(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
}
/* }}} */
@@ -1265,7 +1247,6 @@
Repair a file using an optionally provided configuration file */
static PHP_FUNCTION(tidy_repair_file)
{
- TIDY_SET_CONTEXT;
php_tidy_quick_repair(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
}
/* }}} */
@@ -1289,8 +1270,6 @@
Get release date (version) for Tidy library */
static PHP_FUNCTION(tidy_get_release)
{
- TIDY_SET_CONTEXT;
-
if (ZEND_NUM_ARGS()) {
WRONG_PARAM_COUNT;
}
@@ -1309,7 +1288,7 @@
char *optname, *optval;
int optname_len;
TidyOption opt;
-
+
TIDY_SET_CONTEXT;
if (object) {
@@ -1614,7 +1593,6 @@
Returns a TidyNode Object representing the root of the tidy parse tree */
static PHP_FUNCTION(tidy_get_root)
{
- TIDY_SET_CONTEXT;
php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_root_node);
}
/* }}} */
@@ -1623,7 +1601,6 @@
Returns a TidyNode Object starting from the <HTML> tag of the tidy parse
tree */
static PHP_FUNCTION(tidy_get_html)
{
- TIDY_SET_CONTEXT;
php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_html_node);
}
/* }}} */
@@ -1632,7 +1609,6 @@
Returns a TidyNode Object starting from the <HEAD> tag of the tidy parse
tree */
static PHP_FUNCTION(tidy_get_head)
{
- TIDY_SET_CONTEXT;
php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_head_node);
}
/* }}} */
@@ -1641,7 +1617,6 @@
Returns a TidyNode Object starting from the <BODY> tag of the tidy parse
tree */
static PHP_FUNCTION(tidy_get_body)
{
- TIDY_SET_CONTEXT;
php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_body_node);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
