[PHP-CVS] cvs: php-src /ext/tidy tidy.c

[Nuno Lopes]

nlopess         Sat Jul  8 00:04:38 2006 UTC

  Modified files:              
    /php-src/ext/tidy   tidy.c 
  Log:
  remove some left overs plus static keywording
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.89&r2=1.90&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.89 php-src/ext/tidy/tidy.c:1.90
--- php-src/ext/tidy/tidy.c:1.89        Tue Jun 13 13:12:20 2006
+++ php-src/ext/tidy/tidy.c     Sat Jul  8 00:04:37 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: tidy.c,v 1.89 2006/06/13 13:12:20 dmitry Exp $ */
+/* $Id: tidy.c,v 1.90 2006/07/08 00:04:37 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -315,10 +315,6 @@
        {NULL, NULL, NULL}
 };
 
-zend_function_entry tidy_funcs_exception[] = {
-       {NULL, NULL, NULL}
-};
-
 zend_class_entry *tidy_ce_doc, *tidy_ce_node, *tidy_ce_exception;
 
 static zend_object_handlers tidy_object_handlers_doc;
@@ -346,22 +342,22 @@
 ZEND_GET_MODULE(tidy)
 #endif
 
-void* TIDY_CALL php_tidy_malloc(size_t len)
+static void* TIDY_CALL php_tidy_malloc(size_t len)
 {
        return emalloc(len);
 }
 
-void* TIDY_CALL php_tidy_realloc(void *buf, size_t len)
+static void* TIDY_CALL php_tidy_realloc(void *buf, size_t len)
 {
        return erealloc(buf, len);
 }
 
-void TIDY_CALL php_tidy_free(void *buf)
+static void TIDY_CALL php_tidy_free(void *buf)
 {
        efree(buf);
 }
 
-void TIDY_CALL php_tidy_panic(ctmbstr msg)
+static void TIDY_CALL php_tidy_panic(ctmbstr msg)
 {
        TSRMLS_FETCH();
        php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not allocate memory 
for tidy! (Reason: %s)", (char *)msg);
@@ -466,8 +462,6 @@
        tidyOptSetBool(doc, TidyMark, no);
        
        TIDY_SET_DEFAULT_CONFIG(doc);
-       
-       /* We can't use TIDY_APPLY_CONFIG_ZVAL() here, it uses RETURN_FALSE */
 
        if (ZEND_NUM_ARGS() > 1) {
                TIDY_APPLY_CONFIG_ZVAL(doc, config);
@@ -1000,7 +994,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.89 2006/06/13 13:12:20 dmitry Exp 
$)");
+       php_info_print_table_row(2, "Extension Version", 
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.90 2006/07/08 00:04:37 nlopess 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