- 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
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-10-05
09:40:36 UTC (rev 304070)
@@ -1047,11 +1047,11 @@
/* {{{ 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);
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2010-10-05
09:40:36 UTC (rev 304070)
@@ -84,7 +84,7 @@
} 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 @@
}
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 @@
}
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);
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-05 09:20:03 UTC (rev
304069)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-05 09:40:36 UTC (rev
304070)
@@ -1087,12 +1087,12 @@
*/
void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result,
long fetchtype TSRMLS_DC)
{
+#if !defined(MYSQLI_USE_MYSQLND)
MYSQL_ROW row;
unsigned int i;
MYSQL_FIELD *fields;
unsigned long *field_len;
-
-#if !defined(MYSQLI_USE_MYSQLND)
+
if (!(row = mysql_fetch_row(result))) {
RETURN_NULL();
}
Modified: php/php-src/trunk/ext/mysqli/mysqli_prop.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_prop.c 2010-10-05 09:20:03 UTC (rev
304069)
+++ php/php-src/trunk/ext/mysqli/mysqli_prop.c 2010-10-05 09:40:36 UTC (rev
304070)
@@ -84,7 +84,7 @@
} 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 @@
}
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 @@
}
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);
Modified: php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c 2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c 2010-10-05
09:40:36 UTC (rev 304070)
@@ -154,7 +154,7 @@
{
php_mysqli_result_iterator *iterator = (php_mysqli_result_iterator*)
iter;
- *int_key = iterator->row_num;
+ *int_key = (ulong) iterator->row_num;
return HASH_KEY_IS_LONG;
}
/* }}} */
