Skip to content

Commit 14657ec

Browse files
committed
Squash compile warnings the easy way
1 parent bca32de commit 14657ec

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

ext/pdo_oci/oci_driver.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,9 @@ static const struct pdo_dbh_methods oci_methods = {
705705
pdo_oci_fetch_error_func,
706706
oci_handle_get_attribute,
707707
pdo_oci_check_liveness, /* check_liveness */
708-
NULL /* get_driver_methods */
708+
NULL, /* get_driver_methods */
709+
NULL,
710+
NULL
709711
};
710712

711713
static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ */

ext/pdo_oci/oci_statement.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ static int oci_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *pa
459459
static int oci_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori, zend_long offset) /* {{{ */
460460
{
461461
#ifdef HAVE_OCISTMTFETCH2
462-
ub4 ociori;
462+
ub4 ociori = OCI_FETCH_NEXT;
463463
#endif
464464
pdo_oci_stmt *S = (pdo_oci_stmt*)stmt->driver_data;
465465

@@ -652,7 +652,7 @@ static ssize_t oci_blob_write(php_stream *stream, const char *buf, size_t count)
652652
return amt;
653653
}
654654

655-
static size_t oci_blob_read(php_stream *stream, char *buf, size_t count)
655+
static ssize_t oci_blob_read(php_stream *stream, char *buf, size_t count)
656656
{
657657
struct oci_lob_self *self = (struct oci_lob_self*)stream->abstract;
658658
ub4 amt;
@@ -990,5 +990,7 @@ const struct pdo_stmt_methods oci_stmt_methods = {
990990
oci_stmt_param_hook,
991991
NULL, /* set_attr */
992992
NULL, /* get_attr */
993-
oci_stmt_col_meta
993+
oci_stmt_col_meta,
994+
NULL,
995+
NULL
994996
};

0 commit comments

Comments
 (0)