com php-src: fixed signatures php_uint_t vs php_size _t for len: ext/pdo/php_pdo_driver.h ext/pdo _dblib/dblib_stmt.c ext/pdo_firebird/firebird_state
ment.c ext/pdo_mysql/mysql_statement.c ext/pdo_oc i/oci_statement.c ext/pdo_odbc/odbc_stmt.c ext/pd o_pgsql/pgsql_statement.c

Commit: e7a92a913f084f800f39514519adbf32e64dd049 Author: Anatol Belski <ab@php.net> Sun, 2 Mar 2014 11:30:22 +0100 Parents: e993862fb589e0a542c2d62f65ac2488148d73ec Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7a92a913f084f800f39514519adbf32e64dd049 Log: fixed signatures php_uint_t vs php_size_t for len Changed paths: M ext/pdo/php_pdo_driver.h M ext/pdo_dblib/dblib_stmt.c M ext/pdo_firebird/firebird_statement.c M ext/pdo_mysql/mysql_statement.c M ext/pdo_oci/oci_statement.c M ext/pdo_odbc/odbc_stmt.c M ext/pdo_pgsql/pgsql_statement.c Diff: diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index bdba281..da33e34 100644 --- a/ext/pdo/php_pdo_driver..h +++ b/ext/pdo/php_pdo_driver.h @@ -339,7 +339,7 @@ typedef int (*pdo_stmt_describe_col_func)(pdo_stmt_t *stmt, int colno TSRMLS_DC) * If the driver sets caller_frees, ptr should point to emalloc'd memory * and PDO will free it as soon as it is done using it. */ -typedef int (*pdo_stmt_get_col_data_func)(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_uint_t *len, int *caller_frees TSRMLS_DC); +typedef int (*pdo_stmt_get_col_data_func)(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_size_t *len, int *caller_frees TSRMLS_DC); /* hook for bound params */ enum pdo_param_event { diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c index 5bd4e73..f97b96e 100644 --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@ -213,7 +213,7 @@ static int pdo_dblib_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) } static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, - php_uint_t *len, int *caller_frees TSRMLS_DC) + php_size_t *len, int *caller_frees TSRMLS_DC) { pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data; diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 31c92b8..ebd5b24 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -300,7 +300,7 @@ fetch_blob_end: /* }}} */ static int firebird_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, /* {{{ */ - php_uint_t *len, int *caller_frees TSRMLS_DC) + php_size_t *len, int *caller_frees TSRMLS_DC) { pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt->driver_data; XSQLVAR const *var = &S->out_sqlda.sqlvar[colno]; diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index c5b6722..64e54ca 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -702,7 +702,7 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{ } /* }}} */ -static int pdo_mysql_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_uint_t *len, int *caller_frees TSRMLS_DC) /* {{{ */ +static int pdo_mysql_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_size_t *len, int *caller_frees TSRMLS_DC) /* {{{ */ { pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c index 0ebf37a..3f8312e 100644 --- a/ext/pdo_oci/oci_statement.c +++ b/ext/pdo_oci/oci_statement.c @@ -718,7 +718,7 @@ static php_stream *oci_create_lob_stream(pdo_stmt_t *stmt, OCILobLocator *lob TS return NULL; } -static int oci_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_uint_t *len, int *caller_frees TSRMLS_DC) /* {{{ */ +static int oci_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_size_t *len, int *caller_frees TSRMLS_DC) /* {{{ */ { pdo_oci_stmt *S = (pdo_oci_stmt*)stmt->driver_data; pdo_oci_column *C = &S->cols[colno]; diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index 16957a3..5cd8397 100644 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -613,7 +613,7 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) return 1; } -static int odbc_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_uint_t *len, int *caller_frees TSRMLS_DC) +static int odbc_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_size_t *len, int *caller_frees TSRMLS_DC) { pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data; pdo_odbc_column *C = &S->cols[colno]; diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index 1c3e85a..930b7f9 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -490,7 +490,7 @@ static int pgsql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) return 1; } -static int pgsql_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_uint_t *len, int *caller_frees TSRMLS_DC) +static int pgsql_stmt_get_col(pdo_stmt_t *stmt, php_int_t colno, char **ptr, php_size_t *len, int *caller_frees TSRMLS_DC) { pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data; struct pdo_column_data *cols = stmt->columns;