diff options
| author | Anatol Belski <ab@php.net> | 2016-11-26 15:18:42 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-26 17:29:01 +0100 |
| commit | b204b3abd19f86bd9217866189cdebcc6abc0d95 (patch) | |
| tree | 324e3c86634583ef7d58bc0f3e19dfbdeb85773c /ext/mysqli/mysqli_api.c | |
| parent | 1b7e014d1ce21b9eb6021111c1005d047b5b9a1b (diff) | |
| download | php-git-b204b3abd19f86bd9217866189cdebcc6abc0d95.tar.gz | |
further normalizations, uint vs uint32_t
fix merge mistake
yet one more replacement run
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index fb522130d6..12f07948de 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -596,7 +596,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result) MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID); - if ((uint)argc != mysql_stmt_field_count(stmt->stmt)) { + if ((uint32_t)argc != mysql_stmt_field_count(stmt->stmt)) { php_error_docref(NULL, E_WARNING, "Number of bind variables doesn't match number of fields in prepared statement"); RETURN_FALSE; } @@ -1330,7 +1330,7 @@ PHP_FUNCTION(mysqli_field_seek) } MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); - if (fieldnr < 0 || (uint)fieldnr >= mysql_num_fields(result)) { + if (fieldnr < 0 || (uint32_t)fieldnr >= mysql_num_fields(result)) { php_error_docref(NULL, E_WARNING, "Invalid field offset"); RETURN_FALSE; } @@ -2538,7 +2538,7 @@ PHP_FUNCTION(mysqli_stmt_store_result) #if MYSQL_VERSION_ID >= 50107 my_bool tmp=1; #else - uint tmp=1; + uint32_t tmp=1; #endif mysql_stmt_attr_set(stmt->stmt, STMT_ATTR_UPDATE_MAX_LENGTH, &tmp); break; |