Commit: fa2a2c88fdb6286423bbd1c8cbe59547625dcf90 Author: Anatol Belski <a...@php.net> Wed, 11 Dec 2013 23:39:43 +0100 Parents: 6d5c56367ddde7d0ef79b402e37ae082fab33a8f Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa2a2c88fdb6286423bbd1c8cbe59547625dcf90 Log: revamp ext/pdo_mysql Changed paths: M ext/pdo_mysql/mysql_driver.c M ext/pdo_mysql/mysql_statement.c Diff: diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index f97dbd2..641fb5c 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -168,7 +168,7 @@ static int mysql_handle_preparer(pdo_dbh_t *dbh, const char *sql, zend_str_size char *nsql = NULL; zend_str_size_int nsql_len = 0; int ret; - int server_version; + php_uint_t server_version; PDO_DBG_ENTER("mysql_handle_preparer"); PDO_DBG_INF_FMT("dbh=%p", dbh); diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 5128366..4c4d0fb 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -675,7 +675,7 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{ PDO_DBG_RETURN(1); } for (i = 0; i < stmt->column_count; i++) { - int namelen; + zend_str_size_int namelen; if (S->H->fetch_table_names) { namelen = spprintf(&cols[i].name, 0, "%s.%s", S->fields[i].table, S->fields[i].name); @@ -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, int 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_uint_t *len, int *caller_frees TSRMLS_DC) /* {{{ */ { pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
