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

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  Remove noop param hook
  Clean up tabs and whitespace
This commit is contained in:
Adam Baratz 2016-12-07 17:10:36 -05:00
commit d98da850c4
6 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/pdo/pdo_stmt.c
View file

@ -269,7 +269,7 @@ static void param_dtor(zval *el) /* {{{ */
/* tell the driver that it is going away */
if (param->stmt->methods->param_hook) {
param->stmt->methods->param_hook(param->stmt, param, PDO_PARAM_EVT_FREE);
param->stmt->methods->param_hook(param->stmt, param, PDO_PARAM_EVT_FREE);
}
if (param->name) {

5
ext/pdo_dblib/dblib_driver.c
View file

@ -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
};

8
ext/pdo_dblib/dblib_stmt.c
View file

@ -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 */

1
ext/pdo_dblib/pdo_dblib.c
View file

@ -233,4 +233,3 @@ PHP_MINFO_FUNCTION(pdo_dblib)
php_info_print_table_row(2, "Flavour", PDO_DBLIB_FLAVOUR);
php_info_print_table_end();
}

1
ext/pdo_dblib/php_pdo_dblib.h
View file

@ -43,4 +43,3 @@ PHP_MINFO_FUNCTION(pdo_dblib);
PHP_RSHUTDOWN_FUNCTION(pdo_dblib);
#endif

1
ext/pdo_dblib/php_pdo_dblib_int.h
View file

@ -151,4 +151,3 @@ enum {
};
#endif