]> granicus.if.org Git - php/commitdiff
Fixed compiler warning "incompatible pointer type"
authorXinchen Hui <laruence@php.net>
Mon, 5 Sep 2011 15:02:21 +0000 (15:02 +0000)
committerXinchen Hui <laruence@php.net>
Mon, 5 Sep 2011 15:02:21 +0000 (15:02 +0000)
ext/filter/sanitizing_filters.c
ext/mysqlnd/mysqlnd_bt.c
ext/pdo/pdo.c

index b0348dbef56b67f2beec638f22e01dd8f51055bc..dba4251b06cbcec242bee81469e6f974e409a89e 100644 (file)
@@ -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;
index 536782063da0549cf9251972ad072d8d1d376942..dfc12be8f23b4ab2f4283894bdef7cc24f1ad060 100644 (file)
@@ -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) {
index b654fea639948a50b19a19b14880bf69fc68b21a..8a634f2b1e962fb48f2c0f3bc62a15115f2a033d 100755 (executable)
@@ -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;