Skip to content

Commit 475ea62

Browse files
kamil-tekielanikic
authored andcommitted
Remove unused mysqli global
And fix formatting issues.
1 parent 321e0d4 commit 475ea62

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

ext/mysqli/mysqli.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,9 @@ static PHP_GINIT_FUNCTION(mysqli)
510510
ZEND_TSRMLS_CACHE_UPDATE();
511511
#endif
512512
mysqli_globals->num_links = 0;
513+
mysqli_globals->max_links = -1;
513514
mysqli_globals->num_active_persistent = 0;
514515
mysqli_globals->num_inactive_persistent = 0;
515-
mysqli_globals->max_links = -1;
516516
mysqli_globals->max_persistent = -1;
517517
mysqli_globals->allow_persistent = 1;
518518
mysqli_globals->default_port = 0;
@@ -522,7 +522,6 @@ static PHP_GINIT_FUNCTION(mysqli)
522522
mysqli_globals->default_socket = NULL;
523523
mysqli_globals->reconnect = 0;
524524
mysqli_globals->report_mode = 0;
525-
mysqli_globals->report_ht = 0;
526525
mysqli_globals->allow_local_infile = 0;
527526
mysqli_globals->local_infile_directory = NULL;
528527
mysqli_globals->rollback_on_cached_plink = FALSE;

ext/mysqli/php_mysqli_structs.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -263,28 +263,24 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
263263

264264

265265
ZEND_BEGIN_MODULE_GLOBALS(mysqli)
266-
zend_long default_link;
267266
zend_long num_links;
268267
zend_long max_links;
269268
zend_long num_active_persistent;
270269
zend_long num_inactive_persistent;
271270
zend_long max_persistent;
272271
zend_long allow_persistent;
273-
zend_ulong default_port;
274-
char *default_host;
275-
char *default_user;
276-
char *default_socket;
277-
char *default_pw;
272+
zend_ulong default_port;
273+
char *default_host;
274+
char *default_user;
275+
char *default_pw;
276+
char *default_socket;
278277
zend_long reconnect;
279278
zend_long allow_local_infile;
280279
char *local_infile_directory;
281-
zend_long strict;
282280
zend_long error_no;
283-
char *error_msg;
281+
char *error_msg;
284282
zend_long report_mode;
285-
HashTable *report_ht;
286-
zend_ulong multi_query;
287-
bool rollback_on_cached_plink;
283+
bool rollback_on_cached_plink;
288284
ZEND_END_MODULE_GLOBALS(mysqli)
289285

290286
#define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v)

0 commit comments

Comments
 (0)