Fixed compiler warnings in mysqli

 - mysqli.c: Fix unused variables, they are only used in non-mysqlnd mode
 - mysqli_api.c (PHP_5_3 only): Fix constness, add_property_string expects a char *, not a const char *
 - mysqli_prop.c: Cast to long, as its below the LONG_MAX and therefore safe
 - mysqli_result_iterator.c: Cast to ulong as the iterator member expects that rather than a my_longlong

# In trunk only warnings regarding the zend_property_info
# structure is present and PHP_5_3 is warning free now

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 6ce166713e9db48ac1d5d9a60dd4ec7e9f481ec0..841f00f5913e740312e0d08ac11e60ef84e39584 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1047,11 +1047,11 @@ PHP_FUNCTION(mysqli_stmt_fetch)
 /* {{{  php_add_field_properties */
 static void php_add_field_properties(zval *value, const MYSQL_FIELD *field TSRMLS_DC)
 {
-       add_property_string(value, "name",(field->name ? field->name : ""), 1);
-       add_property_string(value, "orgname",(field->org_name ? field->org_name : ""), 1);
-       add_property_string(value, "table",(field->table ? field->table : ""), 1);
-       add_property_string(value, "orgtable",(field->org_table ? field->org_table : ""), 1);
-       add_property_string(value, "def",(field->def ? field->def : ""), 1);
+       add_property_string(value, "name", (char *) (field->name ? field->name : ""), 1);
+       add_property_string(value, "orgname", (char *) (field->org_name ? field->org_name : ""), 1);
+       add_property_string(value, "table", (char *) (field->table ? field->table : ""), 1);
+       add_property_string(value, "orgtable", (char *) (field->org_table ? field->org_table : ""), 1);
+       add_property_string(value, "def", (field->def ? field->def : ""), 1);
 
        add_property_long(value, "max_length", field->max_length);
        add_property_long(value, "length", field->length);

diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index 98b81ee04a1c056980e5280c8f206511bc7d1b09..b4535654fb7806e8a96e49b4e533cb21d66e539e 100644 (file)
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -84,7 +84,7 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
        } else {\
                l = (__ret_type)__int_func(p);\
                if (l < LONG_MAX) {\
-                       ZVAL_LONG(*retval, l);\
+                       ZVAL_LONG(*retval, (long) l);\
                } else { \
                        char *ret; \
                        int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \
@@ -178,7 +178,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
                }
 
                if (rc < LONG_MAX) {
-                       ZVAL_LONG(*retval, rc);
+                       ZVAL_LONG(*retval, (long) rc);
                } else {
                        char *ret;
                        int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
@@ -295,7 +295,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
                }
 
                if (rc < LONG_MAX) {
-                       ZVAL_LONG(*retval, rc);
+                       ZVAL_LONG(*retval, (long) rc);
                } else {
                        char *ret;
                        int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);