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/dblib_driver.c | |
| 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/dblib_driver.c')
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 5 |
1 files changed, 2 insertions, 3 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 }; - |