com php-src: revamp ext/pdo_firebird: ext/pdo_firebird/ firebird_driver.c ext/pdo_firebird/firebird_statement .c

Commit: b90cc170b6cb517dc376269e1ef45e12b49fb941 Author: Anatol Belski <ab@php.net> Tue, 17 Dec 2013 10:14:55 +0100 Parents: 1337ba8a626fef796daaf709590af9bd4dda74fa Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b90cc170b6cb517dc376269e1ef45e12b49fb941 Log: revamp ext/pdo_firebird Changed paths: M ext/pdo_firebird/firebird_driver.c M ext/pdo_firebird/firebird_statement.c Diff: diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 656751b..86511cf 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -35,7 +35,7 @@ #include "php_pdo_firebird.h" #include "php_pdo_firebird_int.h" -static int firebird_alloc_prepare_stmt(pdo_dbh_t*, const char*, php_int_t, XSQLDA*, isc_stmt_handle*, +static int firebird_alloc_prepare_stmt(pdo_dbh_t*, const char*, zend_str_size, XSQLDA*, isc_stmt_handle*, HashTable* TSRMLS_DC); /* map driver specific error message to PDO error */ @@ -220,7 +220,7 @@ static int firebird_handle_preparer(pdo_dbh_t *dbh, const char *sql, zend_str_si /* }}} */ /* called by PDO to execute a statement that doesn't produce a result set */ -static php_int_t firebird_handle_doer(pdo_dbh_t *dbh, const char *sql, php_int_t sql_len TSRMLS_DC) /* {{{ */ +static php_int_t firebird_handle_doer(pdo_dbh_t *dbh, const char *sql, zend_str_size sql_len TSRMLS_DC) /* {{{ */ { pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data; isc_stmt_handle stmt = NULL; @@ -274,8 +274,8 @@ static php_int_t firebird_handle_doer(pdo_dbh_t *dbh, const char *sql, php_int_t /* }}} */ /* called by the PDO SQL parser to add quotes to values that are copied into SQL */ -static int firebird_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, /* {{{ */ - char **quoted, int *quotedlen, enum pdo_param_type paramtype TSRMLS_DC) +static int firebird_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, zend_str_size_int unquotedlen, /* {{{ */ + char **quoted, zend_str_size_int *quotedlen, enum pdo_param_type paramtype TSRMLS_DC) { int qcount = 0; char const *co, *l, *r; diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 0e92c6d..acfa713 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -229,7 +229,9 @@ static int firebird_fetch_blob(pdo_stmt_t *stmt, int colno, char **ptr, /* {{{ * char const bl_item = isc_info_blob_total_length; char bl_info[20]; unsigned short i; - int result = *len = 0; + int result = 0; + + *len = 0; if (isc_open_blob(H->isc_status, &H->db, &H->tr, &blobh, blob_id)) { RECORD_ERROR(stmt); @@ -297,7 +299,7 @@ fetch_blob_end: } /* }}} */ -static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{{ */ +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) { pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt->driver_data;