diff options
| author | Christopher Jones <sixd@php.net> | 2020-09-10 17:37:18 +1000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2020-09-10 17:37:18 +1000 |
| commit | 14657ec42d9700b8c0222104b9a142c3ed038bb7 (patch) | |
| tree | 251dc47cb5da4ef5bf0e3ae017b2efd48bfd5466 | |
| parent | bca32de0c7d030e75d052fb51255bc9303fa010c (diff) | |
| download | php-git-14657ec42d9700b8c0222104b9a142c3ed038bb7.tar.gz | |
Squash compile warnings the easy way
| -rw-r--r-- | ext/pdo_oci/oci_driver.c | 4 | ||||
| -rw-r--r-- | ext/pdo_oci/oci_statement.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index d2115b81b8..096a26575e 100644 --- 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 fab9f64af1..6e121dd9b7 100644 --- 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 }; |