Squash compile warnings the easy way

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index d2115b81b80f3a4e881ac8da9e33e6de1e10bf58..096a26575ef0c0a991ef0c87b643774eb18cfe21 100644 (file)
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -705,7 +705,9 @@ static const struct pdo_dbh_methods oci_methods = {
        pdo_oci_fetch_error_func,
        oci_handle_get_attribute,
        pdo_oci_check_liveness, /* check_liveness */
-       NULL    /* get_driver_methods */
+       NULL,   /* get_driver_methods */
+       NULL,
+       NULL
 };
 
 static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ */

diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c
index fab9f64af134f33d40afddf78ff85b817c254dbf..6e121dd9b717bc6b8fd0cd8d91f81f126b8d0c7c 100644 (file)
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
@@ -459,7 +459,7 @@ static int oci_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *pa
 static int oci_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori,    zend_long offset) /* {{{ */
 {
 #ifdef HAVE_OCISTMTFETCH2
-       ub4 ociori;
+       ub4 ociori = OCI_FETCH_NEXT;
 #endif
        pdo_oci_stmt *S = (pdo_oci_stmt*)stmt->driver_data;
 
@@ -652,7 +652,7 @@ static ssize_t oci_blob_write(php_stream *stream, const char *buf, size_t count)
        return amt;
 }
 
-static size_t oci_blob_read(php_stream *stream, char *buf, size_t count)
+static ssize_t oci_blob_read(php_stream *stream, char *buf, size_t count)
 {
        struct oci_lob_self *self = (struct oci_lob_self*)stream->abstract;
        ub4 amt;
@@ -990,5 +990,7 @@ const struct pdo_stmt_methods oci_stmt_methods = {
        oci_stmt_param_hook,
        NULL, /* set_attr */
        NULL, /* get_attr */
-       oci_stmt_col_meta
+       oci_stmt_col_meta,
+       NULL,
+       NULL
 };