diff options
author | Adam Baratz <adambaratz@php.net> | 2016-12-07 17:10:36 -0500 |
---|---|---|
committer | Adam Baratz <adambaratz@php.net> | 2016-12-07 17:10:36 -0500 |
commit | d98da850c468ae5b7a32f1448315de88a795342e (patch) | |
tree | 507e1438c1aae99ea72226f251a909983be37781 /ext/pdo_dblib | |
parent | 76fe66c8ddf4ab6cfce1b586d38f2ade64c3e8a9 (diff) | |
parent | 5a20d83be8d16ab4ad62be6f8c6be2825e8629b8 (diff) | |
download | php-git-d98da850c468ae5b7a32f1448315de88a795342e.tar.gz |
Merge branch 'PHP-7.1'
* PHP-7.1:
Remove noop param hook
Clean up tabs and whitespace
Diffstat (limited to 'ext/pdo_dblib')
-rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 5 | ||||
-rw-r--r-- | ext/pdo_dblib/dblib_stmt.c | 8 | ||||
-rw-r--r-- | ext/pdo_dblib/pdo_dblib.c | 1 | ||||
-rw-r--r-- | ext/pdo_dblib/php_pdo_dblib.h | 1 | ||||
-rw-r--r-- | ext/pdo_dblib/php_pdo_dblib_int.h | 1 |
5 files changed, 3 insertions, 13 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index f7f9f3872b..dd77169d57 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -334,7 +334,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options) ,{"auto",0} /* Only works with FreeTDS. Other drivers will bork */ }; - + struct pdo_data_src_parser vars[] = { { "charset", NULL, 0 } ,{ "appname", "PHP " PDO_DBLIB_FLAVOUR, 0 } @@ -346,7 +346,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options) nvars = sizeof(vars)/sizeof(vars[0]); nvers = sizeof(tdsver)/sizeof(tdsver[0]); - + php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, nvars); H = pecalloc(1, sizeof(*H), dbh->is_persistent); @@ -487,4 +487,3 @@ pdo_driver_t pdo_dblib_driver = { #endif pdo_dblib_handle_factory }; - diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c index 9b944fd0b5..ee0def267e 100644 --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@ -444,12 +444,6 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, return 1; } -static int pdo_dblib_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *param, - enum pdo_param_event event_type) -{ - return 1; -} - static int pdo_dblib_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval *return_value) { pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data; @@ -499,7 +493,7 @@ struct pdo_stmt_methods dblib_stmt_methods = { pdo_dblib_stmt_fetch, pdo_dblib_stmt_describe, pdo_dblib_stmt_get_col, - pdo_dblib_stmt_param_hook, + NULL, /* param hook */ NULL, /* set attr */ NULL, /* get attr */ pdo_dblib_stmt_get_column_meta, /* meta */ diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c index d19429ec34..54391da34e 100644 --- a/ext/pdo_dblib/pdo_dblib.c +++ b/ext/pdo_dblib/pdo_dblib.c @@ -233,4 +233,3 @@ PHP_MINFO_FUNCTION(pdo_dblib) php_info_print_table_row(2, "Flavour", PDO_DBLIB_FLAVOUR); php_info_print_table_end(); } - diff --git a/ext/pdo_dblib/php_pdo_dblib.h b/ext/pdo_dblib/php_pdo_dblib.h index c72a859716..6d652c3fcd 100644 --- a/ext/pdo_dblib/php_pdo_dblib.h +++ b/ext/pdo_dblib/php_pdo_dblib.h @@ -43,4 +43,3 @@ PHP_MINFO_FUNCTION(pdo_dblib); PHP_RSHUTDOWN_FUNCTION(pdo_dblib); #endif - diff --git a/ext/pdo_dblib/php_pdo_dblib_int.h b/ext/pdo_dblib/php_pdo_dblib_int.h index 0b2c3a5dd0..6c22ff74c2 100644 --- a/ext/pdo_dblib/php_pdo_dblib_int.h +++ b/ext/pdo_dblib/php_pdo_dblib_int.h @@ -151,4 +151,3 @@ enum { }; #endif - |