laruence Mon, 05 Sep 2011 15:02:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316185
Log:
Fixed compiler warning "incompatible pointer type"
Changed paths:
U php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c
U php/php-src/branches/PHP_5_4/ext/pdo/pdo.c
U php/php-src/trunk/ext/filter/sanitizing_filters.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c
U php/php-src/trunk/ext/pdo/pdo.c
Modified: php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
2011-09-05 14:52:23 UTC (rev 316184)
+++ php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
2011-09-05 15:02:21 UTC (rev 316185)
@@ -250,7 +250,8 @@
void php_filter_full_special_chars(PHP_INPUT_FILTER_PARAM_DECL)
{
char *buf;
- int len, quotes;
+ size_t len;
+ int quotes;
if (!(flags & FILTER_FLAG_NO_ENCODE_QUOTES)) {
quotes = ENT_QUOTES;
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c 2011-09-05
14:52:23 UTC (rev 316184)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c 2011-09-05
15:02:21 UTC (rev 316185)
@@ -373,7 +373,7 @@
TRACE_APPEND_STR("Object(");
- dupl = zend_get_object_classname(*arg, &class_name,
&class_name_len TSRMLS_CC);
+ dupl = zend_get_object_classname(*arg, (const char
**)&class_name, &class_name_len TSRMLS_CC);
TRACE_APPEND_STRL(class_name, class_name_len);
if (!dupl) {
Modified: php/php-src/branches/PHP_5_4/ext/pdo/pdo.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo/pdo.c 2011-09-05 14:52:23 UTC (rev
316184)
+++ php/php-src/branches/PHP_5_4/ext/pdo/pdo.c 2011-09-05 15:02:21 UTC (rev
316185)
@@ -277,7 +277,7 @@
parsed[j].optval = estrndup(data_source
+ valstart, semi - valstart - n_semicolumns);
} else {
int vlen = semi - valstart;
- char *orig_val = data_source + valstart;
+ const char *orig_val = data_source +
valstart;
char *new_val = (char *) emalloc(vlen
- n_semicolumns + 1);
parsed[j].optval = new_val;
Modified: php/php-src/trunk/ext/filter/sanitizing_filters.c
===================================================================
--- php/php-src/trunk/ext/filter/sanitizing_filters.c 2011-09-05 14:52:23 UTC
(rev 316184)
+++ php/php-src/trunk/ext/filter/sanitizing_filters.c 2011-09-05 15:02:21 UTC
(rev 316185)
@@ -250,7 +250,8 @@
void php_filter_full_special_chars(PHP_INPUT_FILTER_PARAM_DECL)
{
char *buf;
- int len, quotes;
+ size_t len;
+ int quotes;
if (!(flags & FILTER_FLAG_NO_ENCODE_QUOTES)) {
quotes = ENT_QUOTES;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c 2011-09-05 14:52:23 UTC (rev
316184)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c 2011-09-05 15:02:21 UTC (rev
316185)
@@ -373,7 +373,7 @@
TRACE_APPEND_STR("Object(");
- dupl = zend_get_object_classname(*arg, &class_name,
&class_name_len TSRMLS_CC);
+ dupl = zend_get_object_classname(*arg, (const char
**)&class_name, &class_name_len TSRMLS_CC);
TRACE_APPEND_STRL(class_name, class_name_len);
if (!dupl) {
Modified: php/php-src/trunk/ext/pdo/pdo.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo.c 2011-09-05 14:52:23 UTC (rev 316184)
+++ php/php-src/trunk/ext/pdo/pdo.c 2011-09-05 15:02:21 UTC (rev 316185)
@@ -277,7 +277,7 @@
parsed[j].optval = estrndup(data_source
+ valstart, semi - valstart - n_semicolumns);
} else {
int vlen = semi - valstart;
- char *orig_val = data_source + valstart;
+ const char *orig_val = data_source +
valstart;
char *new_val = (char *) emalloc(vlen
- n_semicolumns + 1);
parsed[j].optval = new_val;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
