mike            Tue Jul 25 23:03:57 2006 UTC

  Modified files:              
    /php-src/ext/tidy   tidy.c 
  Log:
  - fix compiler warnings
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.91&r2=1.92&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.91 php-src/ext/tidy/tidy.c:1.92
--- php-src/ext/tidy/tidy.c:1.91        Tue Jul 25 22:57:31 2006
+++ php-src/ext/tidy/tidy.c     Tue Jul 25 23:03:56 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: tidy.c,v 1.91 2006/07/25 22:57:31 mike Exp $ */
+/* $Id: tidy.c,v 1.92 2006/07/25 23:03:56 mike Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -479,7 +479,7 @@
                TidyBuffer buf = {0};
                
                tidyBufInit(&buf);
-               tidyBufAttach(&buf, data, data_len);
+               tidyBufAttach(&buf, (byte *) data, data_len);
                
                if (tidyParseBuffer(doc, &buf) < 0) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", 
errbuf->bp);
@@ -490,7 +490,7 @@
 
                                tidySaveBuffer (doc, &output);
                                FIX_BUFFER(&output);
-                               RETVAL_STRINGL(output.bp, output.size-1, 0);
+                               RETVAL_STRINGL((char *) output.bp, 
output.size-1, 0);
                        } else {
                                RETVAL_FALSE;
                        }
@@ -514,7 +514,7 @@
        if (!(stream = php_stream_open_wrapper(filename, "rb", 
(use_include_path ? USE_PATH : 0), NULL))) {
                return NULL;
        }
-       if ((*len = (int) php_stream_copy_to_mem(stream, (void**)&data, 
PHP_STREAM_COPY_ALL, 0)) == 0) {
+       if ((*len = (int) php_stream_copy_to_mem(stream, (void*) &data, 
PHP_STREAM_COPY_ALL, 0)) == 0) {
                data = estrdup("");
                *len = 0;
        }
@@ -661,7 +661,7 @@
                case IS_STRING:
                        obj = (PHPTidyObj *)zend_object_store_get_object(in 
TSRMLS_CC);
                        tidySaveBuffer (obj->ptdoc->doc, &output);
-                       ZVAL_STRINGL(out, output.bp, output.size, 0);
+                       ZVAL_STRINGL(out, (char *) output.bp, output.size, 0);
                        break;
 
                default:
@@ -692,7 +692,7 @@
                case IS_STRING:
                        obj = (PHPTidyObj *)zend_object_store_get_object(in 
TSRMLS_CC);
                        tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
-                       ZVAL_STRINGL(out, buf.bp, buf.size, 0);
+                       ZVAL_STRINGL(out, (char *) buf.bp, buf.size, 0);
                        break;
 
                default:
@@ -712,13 +712,13 @@
        
        if (output.size) {
                MAKE_STD_ZVAL(temp);
-               ZVAL_STRINGL(temp, output.bp, output.size, 0);
+               ZVAL_STRINGL(temp, (char *) output.bp, output.size, 0);
                zend_hash_update(obj->std.properties, "value", sizeof("value"), 
(void *)&temp, sizeof(zval *), NULL);
        }
 
        if (obj->ptdoc->errbuf->size) {
                MAKE_STD_ZVAL(temp);
-               ZVAL_STRINGL(temp, obj->ptdoc->errbuf->bp, 
obj->ptdoc->errbuf->size-1, TRUE);
+               ZVAL_STRINGL(temp, (char *) obj->ptdoc->errbuf->bp, 
obj->ptdoc->errbuf->size-1, TRUE);
                zend_hash_update(obj->std.properties, "errorBuffer", 
sizeof("errorBuffer"), (void *)&temp, sizeof(zval *), NULL);
        }
 }
@@ -884,7 +884,7 @@
        zend_bool clear_str;
 
        for (zend_hash_internal_pointer_reset(ht_options);
-                zend_hash_get_current_data(ht_options, (void **)&opt_val) == 
SUCCESS;
+                zend_hash_get_current_data(ht_options, (void *) &opt_val) == 
SUCCESS;
                 zend_hash_move_forward(ht_options)) {
                
                switch (zend_hash_get_current_key_ex(ht_options, &opt_name, 
&opt_name_len, &opt_indx, FALSE, NULL)) {
@@ -930,7 +930,7 @@
        }
        
        tidyBufInit(&buf);
-       tidyBufAttach(&buf, string, len);
+       tidyBufAttach(&buf, (byte *) string, len);
        if (tidyParseBuffer(obj->ptdoc->doc, &buf) < 0) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", 
obj->ptdoc->errbuf->bp);
                return FAILURE;
@@ -987,7 +987,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.91 2006/07/25 22:57:31 mike Exp $)");
+       php_info_print_table_row(2, "Extension Version", 
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.92 2006/07/25 23:03:56 mike Exp $)");
        php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();
@@ -1024,7 +1024,7 @@
                TidyBuffer buf = {0};
                
                tidyBufInit(&buf);
-               tidyBufAttach(&buf, input, input_len);
+               tidyBufAttach(&buf, (byte *) input, input_len);
                
                if (tidyParseBuffer(doc, &buf) < 0 || tidyCleanAndRepair(doc) < 
0) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", 
errbuf.bp);
@@ -1035,7 +1035,7 @@
 
                        tidySaveBuffer(doc, &output);
                        FIX_BUFFER(&output);
-                       RETVAL_STRINGL(output.bp, output.size-1, 0);
+                       RETVAL_STRINGL((char *) output.bp, output.size-1, 0);
                }
        } else {
                RETVAL_NULL();
@@ -1082,7 +1082,7 @@
        TIDY_FETCH_OBJECT;
 
        if (obj->ptdoc->errbuf && obj->ptdoc->errbuf->bp) {
-               RETURN_STRINGL(obj->ptdoc->errbuf->bp, 
obj->ptdoc->errbuf->size-1, 1);
+               RETURN_STRINGL((char *) obj->ptdoc->errbuf->bp, 
obj->ptdoc->errbuf->size-1, 1);
        } else {
                RETURN_FALSE;
        }
@@ -1098,7 +1098,7 @@
 
        tidySaveBuffer(obj->ptdoc->doc, &output);
        FIX_BUFFER(&output);
-       RETVAL_STRINGL(output.bp, output.size-1, 0);
+       RETVAL_STRINGL((char *) output.bp, output.size-1, 0);
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to