diff options
| author | Dharman <tekiela246@gmail.com> | 2021-03-13 19:42:38 +0000 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-15 10:33:03 +0100 |
| commit | 475ea62dd7dd92533a51dcd77a6b261a9e278768 (patch) | |
| tree | a3f22f5e1c9bd93bf96a689b1c3b6b75c5fb17b9 | |
| parent | 321e0d451dbe35de292e0884e9015a18f5a98741 (diff) | |
| download | php-git-475ea62dd7dd92533a51dcd77a6b261a9e278768.tar.gz | |
Remove unused mysqli global
And fix formatting issues.
| -rw-r--r-- | ext/mysqli/mysqli.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 18 |
2 files changed, 8 insertions, 13 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index bc29c74ce0..50f068f369 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -510,9 +510,9 @@ static PHP_GINIT_FUNCTION(mysqli) ZEND_TSRMLS_CACHE_UPDATE(); #endif mysqli_globals->num_links = 0; + mysqli_globals->max_links = -1; mysqli_globals->num_active_persistent = 0; mysqli_globals->num_inactive_persistent = 0; - mysqli_globals->max_links = -1; mysqli_globals->max_persistent = -1; mysqli_globals->allow_persistent = 1; mysqli_globals->default_port = 0; @@ -522,7 +522,6 @@ static PHP_GINIT_FUNCTION(mysqli) mysqli_globals->default_socket = NULL; mysqli_globals->reconnect = 0; mysqli_globals->report_mode = 0; - mysqli_globals->report_ht = 0; mysqli_globals->allow_local_infile = 0; mysqli_globals->local_infile_directory = NULL; mysqli_globals->rollback_on_cached_plink = FALSE; diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index b86b58c944..5a80e2f6bf 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -263,28 +263,24 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul ZEND_BEGIN_MODULE_GLOBALS(mysqli) - zend_long default_link; zend_long num_links; zend_long max_links; zend_long num_active_persistent; zend_long num_inactive_persistent; zend_long max_persistent; zend_long allow_persistent; - zend_ulong default_port; - char *default_host; - char *default_user; - char *default_socket; - char *default_pw; + zend_ulong default_port; + char *default_host; + char *default_user; + char *default_pw; + char *default_socket; zend_long reconnect; zend_long allow_local_infile; char *local_infile_directory; - zend_long strict; zend_long error_no; - char *error_msg; + char *error_msg; zend_long report_mode; - HashTable *report_ht; - zend_ulong multi_query; - bool rollback_on_cached_plink; + bool rollback_on_cached_plink; ZEND_END_MODULE_GLOBALS(mysqli) #define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v) |