svn: /php/php-src/ branches/PHP_5_4/ext/standard/html.c branches/PHP_5_4/ext/standard/php_incomplete_class.h trunk/ext/standard/html.c
trunk/ext/standard/php_incomplete_class.h
| From: | Xinchen Hui | Date: | Wed, 10 Aug 2011 11:59:11 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/ext/standard/html.c branches/PHP_5_4/ext/standard/php_incomplete_class.h trunk/ext/standard/html.c trunk/ext/standard/php_incomplete_class.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65812@lists.php.net to get a copy of this message | ||
laruence Wed, 10 Aug 2011 11:59:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314733
Log:
Eliminated compiler's warnings
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/html.c
U php/php-src/branches/PHP_5_4/ext/standard/php_incomplete_class.h
U php/php-src/trunk/ext/standard/html.c
U php/php-src/trunk/ext/standard/php_incomplete_class.h
Modified: php/php-src/branches/PHP_5_4/ext/standard/html.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/html.c 2011-08-10 11:20:07 UTC (rev 314732)
+++ php/php-src/branches/PHP_5_4/ext/standard/html.c 2011-08-10 11:59:11 UTC (rev 314733)
@@ -378,7 +378,7 @@
zenc = zend_multibyte_get_internal_encoding(TSRMLS_C);
if (zenc != NULL) {
- charset_hint = zend_multibyte_get_encoding_name(zenc);
+ charset_hint = (char *)zend_multibyte_get_encoding_name(zenc);
if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) {
if ((len == 4) /* sizeof (none|auto|pass) */ &&
(!memcmp("pass", charset_hint, 4) ||
@@ -1371,7 +1371,7 @@
unsigned code_point;
int valid;
char *pos = (char*)&old[cursor+1];
- valid = process_numeric_entity(&pos, &code_point);
+ valid = process_numeric_entity((const char **)&pos, &code_point);
if (valid == FAILURE)
goto encode_amp;
if (flags & ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS) {
Modified: php/php-src/branches/PHP_5_4/ext/standard/php_incomplete_class.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/php_incomplete_class.h 2011-08-10 11:20:07 UTC (rev
314732)
+++ php/php-src/branches/PHP_5_4/ext/standard/php_incomplete_class.h 2011-08-10 11:59:11 UTC (rev
314733)
@@ -38,7 +38,7 @@
free_class_name = 1; \
incomplete_class = 1; \
} else { \
- free_class_name = !zend_get_object_classname(struc, &class_name, &name_len TSRMLS_CC);\
+ free_class_name = !zend_get_object_classname(struc, (const char **)&class_name, &name_len
TSRMLS_CC);\
}
#define PHP_CLEANUP_CLASS_ATTRIBUTES() \
Modified: php/php-src/trunk/ext/standard/html.c
===================================================================
--- php/php-src/trunk/ext/standard/html.c 2011-08-10 11:20:07 UTC (rev 314732)
+++ php/php-src/trunk/ext/standard/html.c 2011-08-10 11:59:11 UTC (rev 314733)
@@ -378,7 +378,7 @@
zenc = zend_multibyte_get_internal_encoding(TSRMLS_C);
if (zenc != NULL) {
- charset_hint = zend_multibyte_get_encoding_name(zenc);
+ charset_hint = (char *)zend_multibyte_get_encoding_name(zenc);
if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) {
if ((len == 4) /* sizeof (none|auto|pass) */ &&
(!memcmp("pass", charset_hint, 4) ||
@@ -1371,7 +1371,7 @@
unsigned code_point;
int valid;
char *pos = (char*)&old[cursor+1];
- valid = process_numeric_entity(&pos, &code_point);
+ valid = process_numeric_entity((const char **)&pos, &code_point);
if (valid == FAILURE)
goto encode_amp;
if (flags & ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS) {
Modified: php/php-src/trunk/ext/standard/php_incomplete_class.h
===================================================================
--- php/php-src/trunk/ext/standard/php_incomplete_class.h 2011-08-10 11:20:07 UTC (rev 314732)
+++ php/php-src/trunk/ext/standard/php_incomplete_class.h 2011-08-10 11:59:11 UTC (rev 314733)
@@ -38,7 +38,7 @@
free_class_name = 1; \
incomplete_class = 1; \
} else { \
- free_class_name = !zend_get_object_classname(struc, &class_name, &name_len TSRMLS_CC);\
+ free_class_name = !zend_get_object_classname(struc, (const char **)&class_name, &name_len
TSRMLS_CC);\
}
#define PHP_CLEANUP_CLASS_ATTRIBUTES() \