]> granicus.if.org Git - php/commitdiff
Remove some compilation warnings:
authorChristopher Jones <sixd@php.net>
Tue, 20 Aug 2013 17:33:00 +0000 (10:33 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 20 Aug 2013 17:33:00 +0000 (10:33 -0700)
  'unused variable' and
  'enumeration value not handled in switch'

ext/pdo_oci/oci_driver.c
ext/pdo_oci/oci_statement.c
ext/pdo_odbc/odbc_driver.c
ext/pdo_odbc/odbc_stmt.c

index 5497bebc64465fe6a13dba69e223681cce15e95e..fcdefa94b3ecb2dc76afc5ba2085daf95e1fb4be 100644 (file)
@@ -537,7 +537,9 @@ static int pdo_oci_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
        sb4 error_code = 0;
+#if (!((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2))))
        char version[256];
+#endif
 
        /* TODO move attached check to PDO level */
        if (H->attached == 0) {
index dcb9557803d531632063657ee3253561aac94b4f..6a74efa7ba19f2d11051aca6f59f30c103600614 100644 (file)
@@ -270,6 +270,12 @@ static int oci_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *pa
                P = (pdo_oci_bound_param*)param->driver_data;
 
                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) {
index 33163688eb4eaccec9ee1a62b9d3c5adbd9cfe05..f7f3ef34ed32068c2c696ab546181df305f5b06d 100644 (file)
@@ -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;
 }
index 6ee2fcd6becb6710eabbb94030c6eac47345196a..0e3fd3cbb9f31a842f21f229646a34a6f95812c6 100644 (file)
@@ -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;