cvs: php-src(PHP_5_2) /ext/tidy tidy.c

nlopess Fri May 4 17:11:05 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/tidy tidy.c Log: get ride of warnings (different signdess) http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.22&r2=1.66.2.8.2.23&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.22 php-src/ext/tidy/tidy.c:1.66.2.8.2.23 --- php-src/ext/tidy/tidy.c:1.66.2.8.2.22 Sun Feb 11 16:07:30 2007 +++ php-src/ext/tidy/tidy.c Fri May 4 17:11:05 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.66.2.8.2.22 2007/02/11 16:07:30 nlopess Exp $ */ +/* $Id: tidy.c,v 1.66.2.8.2.23 2007/05/04 17:11:05 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -517,7 +517,7 @@ tidyBufInit(&output); tidySaveBuffer (doc, &output); - RETVAL_STRINGL(output.bp, output.size ? output.size-1 : 0, 1); + RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); } else { RETVAL_FALSE; @@ -685,7 +685,7 @@ obj = (PHPTidyObj *)zend_object_store_get_object(in TSRMLS_CC); tidyBufInit(&output); tidySaveBuffer (obj->ptdoc->doc, &output); - ZVAL_STRINGL(out, output.bp, output.size ? output.size-1 : 0, TRUE); + ZVAL_STRINGL(out, (char*)output.bp, output.size ? output.size-1 : 0, TRUE); tidyBufFree(&output); break; @@ -720,7 +720,7 @@ if (obj->ptdoc) { tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf); } - ZVAL_STRINGL(out, buf.bp, buf.size ? buf.size-1 : 0, TRUE); + ZVAL_STRINGL(out, (char*)buf.bp, buf.size ? buf.size-1 : 0, TRUE); tidyBufFree(&buf); break; @@ -742,7 +742,7 @@ if (output.size) { MAKE_STD_ZVAL(temp); - ZVAL_STRINGL(temp, output.bp, output.size-1, TRUE); + ZVAL_STRINGL(temp, (char*)output.bp, output.size-1, TRUE); zend_hash_update(obj->std.properties, "value", sizeof("value"), (void *)&temp, sizeof(zval *), NULL); } @@ -750,7 +750,7 @@ 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); } } @@ -992,7 +992,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.22 2007/02/11 16:07:30 nlopess Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.23 2007/05/04 17:11:05 nlopess Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -1039,7 +1039,7 @@ tidyBufInit(&output); tidySaveBuffer(doc, &output); - RETVAL_STRINGL(output.bp, output.size ? output.size-1 : 0, 1); + RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); } @@ -1088,7 +1088,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; } @@ -1105,7 +1105,7 @@ tidyBufInit(&output); tidySaveBuffer(obj->ptdoc->doc, &output); - RETVAL_STRINGL(output.bp, output.size ? output.size-1 : 0, 1); + RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); }