com php-src: int -> size_t: ext/odbc/php_odbc.c
| From: | Rasmus Lerdorf | Date: | Wed, 21 Jan 2015 06:58:31 +0000 |
| Subject: | com php-src: int -> size_t: ext/odbc/php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84252@lists.php.net to get a copy of this message | ||
Commit: 030b4b29db60c4e28b1a26e5f2e2f79f27333eb0
Author: Rasmus Lerdorf <rasmus@lerdorf.com> Tue, 20 Jan 2015 22:58:31 -0800
Parents: c5e56f78682ef995a0718d4b2a18d8f055a37a48
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=030b4b29db60c4e28b1a26e5f2e2f79f27333eb0
Log:
int -> size_t
Changed paths:
M ext/odbc/php_odbc.c
Diff:
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 0d075ea..cd49643 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1569,8 +1569,9 @@ PHP_FUNCTION(odbc_exec)
{
zval *pv_conn;
zend_long pv_flags;
+ int numArgs;
char *query;
- int numArgs, query_len;
+ size_t query_len;
odbc_result *result = NULL;
odbc_connection *conn;
RETCODE rc;
@@ -3131,7 +3132,7 @@ PHP_FUNCTION(odbc_columns)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *table = NULL, *column = NULL;
- int cat_len = 0, schema_len = 0, table_len = 0, column_len = 0;
+ size_t cat_len = 0, schema_len = 0, table_len = 0, column_len = 0;
RETCODE rc;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat,
&cat_len, &schema, &schema_len,
@@ -3201,7 +3202,7 @@ PHP_FUNCTION(odbc_columnprivileges)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema, *table, *column;
- int cat_len = 0, schema_len, table_len, column_len;
+ size_t cat_len = 0, schema_len, table_len, column_len;
RETCODE rc;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs!sss", &pv_conn, &cat,
&cat_len, &schema, &schema_len,
@@ -3401,7 +3402,7 @@ PHP_FUNCTION(odbc_primarykeys)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *table = NULL;
- int cat_len = 0, schema_len, table_len;
+ size_t cat_len = 0, schema_len, table_len;
RETCODE rc;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs!ss", &pv_conn, &cat,
&cat_len, &schema, &schema_len, &table, &table_len) == FAILURE) {
@@ -3530,7 +3531,7 @@ PHP_FUNCTION(odbc_procedures)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *proc = NULL;
- int cat_len = 0, schema_len = 0, proc_len = 0;
+ size_t cat_len = 0, schema_len = 0, proc_len = 0;
RETCODE rc;
if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 4) {
@@ -3666,7 +3667,7 @@ PHP_FUNCTION(odbc_statistics)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema, *name;
- int cat_len = 0, schema_len, name_len;
+ size_t cat_len = 0, schema_len, name_len;
SQLUSMALLINT unique, reserved;
RETCODE rc;
@@ -3734,7 +3735,7 @@ PHP_FUNCTION(odbc_tableprivileges)
odbc_result *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *table = NULL;
- int cat_len = 0, schema_len, table_len;
+ size_t cat_len = 0, schema_len, table_len;
RETCODE rc;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs!ss", &pv_conn, &cat,
&cat_len, &schema, &schema_len, &table, &table_len) == FAILURE) {