diff options
| author | Xinchen Hui <laruence@php.net> | 2011-09-05 15:02:21 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-09-05 15:02:21 +0000 |
| commit | 83f61c2c536935da2d1f03d462d99b4681f7f832 (patch) | |
| tree | 5a64a3ec293e435a0a9110abb430bd3951f58a97 | |
| parent | 50d8d816c54fcb6c43b9ef29c01b910c4522f3e6 (diff) | |
| download | php-git-83f61c2c536935da2d1f03d462d99b4681f7f832.tar.gz | |
Fixed compiler warning "incompatible pointer type"
| -rw-r--r-- | ext/filter/sanitizing_filters.c | 3 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_bt.c | 2 | ||||
| -rwxr-xr-x | ext/pdo/pdo.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ext/filter/sanitizing_filters.c b/ext/filter/sanitizing_filters.c index b0348dbef5..dba4251b06 100644 --- a/ext/filter/sanitizing_filters.c +++ b/ext/filter/sanitizing_filters.c @@ -250,7 +250,8 @@ void php_filter_special_chars(PHP_INPUT_FILTER_PARAM_DECL) 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; diff --git a/ext/mysqlnd/mysqlnd_bt.c b/ext/mysqlnd/mysqlnd_bt.c index 536782063d..dfc12be8f2 100644 --- a/ext/mysqlnd/mysqlnd_bt.c +++ b/ext/mysqlnd/mysqlnd_bt.c @@ -373,7 +373,7 @@ static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list 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) { diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index b654fea639..8a634f2b1e 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -277,7 +277,7 @@ PDO_API int php_pdo_parse_data_source(const char *data_source, 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; |