diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-20 10:34:13 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-20 10:34:13 -0700 |
| commit | 7160adf4ad9016dcda945f8697a599acf240163b (patch) | |
| tree | 322eb04607cd83ce8c22d2958fda359873870423 /ext/pdo_odbc | |
| parent | f32c0efc8f60d91f952f7c120cc6895b4358de1a (diff) | |
| parent | b455ba971c3758a9314e3bf7d56b03264d889b60 (diff) | |
| download | php-git-7160adf4ad9016dcda945f8697a599acf240163b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch'
Diffstat (limited to 'ext/pdo_odbc')
| -rw-r--r-- | ext/pdo_odbc/odbc_driver.c | 2 | ||||
| -rw-r--r-- | ext/pdo_odbc/odbc_stmt.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index 33163688eb..f7f3ef34ed 100644 --- a/ext/pdo_odbc/odbc_driver.c +++ b/ext/pdo_odbc/odbc_driver.c @@ -263,7 +263,7 @@ out: static int odbc_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, char **quoted, int *quotedlen, enum pdo_param_type param_type TSRMLS_DC) { - pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data; + /* pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data; */ /* TODO: figure it out */ return 0; } diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index 6ee2fcd6be..0e3fd3cbb9 100644 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -286,6 +286,12 @@ static int odbc_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *p if (param->is_param) { switch (event_type) { + case PDO_PARAM_EVT_FETCH_PRE: + case PDO_PARAM_EVT_FETCH_POST: + case PDO_PARAM_EVT_NORMALIZE: + /* Do nothing */ + break; + case PDO_PARAM_EVT_FREE: P = param->driver_data; if (P) { @@ -543,7 +549,6 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) { pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data; struct pdo_column_data *col = &stmt->columns[colno]; - zend_bool dyn = FALSE; RETCODE rc; SWORD colnamelen; SDWORD colsize, displaysize; @@ -614,7 +619,6 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned l /* if it is a column containing "long" data, perform late binding now */ if (C->is_long) { - unsigned long alloced = 4096; unsigned long used = 0; char *buf; RETCODE rc; |