archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Squash compile warnings the easy way

Browse source
This commit is contained in:
Christopher Jones 2020-09-10 17:37:18 +10:00
parent bca32de0c7
commit 14657ec42d
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pdo_oci/oci_driver.c
View file

@ -705,7 +705,9 @@ static const struct pdo_dbh_methods oci_methods = {
pdo_oci_fetch_error_func, pdo_oci_fetch_error_func,
oci_handle_get_attribute, oci_handle_get_attribute,
pdo_oci_check_liveness, /* check_liveness */ 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) /* {{{ */ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ */

8
ext/pdo_oci/oci_statement.c
View file

@ -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) /* {{{ */ static int oci_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori, zend_long offset) /* {{{ */
{ {
#ifdef HAVE_OCISTMTFETCH2 #ifdef HAVE_OCISTMTFETCH2
ub4 ociori; ub4 ociori = OCI_FETCH_NEXT;
#endif #endif
pdo_oci_stmt *S = (pdo_oci_stmt*)stmt->driver_data; 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; 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; struct oci_lob_self *self = (struct oci_lob_self*)stream->abstract;
ub4 amt; ub4 amt;
@ -990,5 +990,7 @@ const struct pdo_stmt_methods oci_stmt_methods = {
oci_stmt_param_hook, oci_stmt_param_hook,
NULL, /* set_attr */ NULL, /* set_attr */
NULL, /* get_attr */ NULL, /* get_attr */
oci_stmt_col_meta oci_stmt_col_meta,
NULL,
NULL
}; };