archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up ODBC header (#16754)

Browse source 
Remove an unused field from globals, fix indentation.
This commit is contained in:
Calvin Buckley 2024-11-11 14:05:45 -05:00 • committed by GitHub
parent dfba04e807
commit cec9a98bc6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/odbc/php_odbc.c
View file

@ -545,7 +545,6 @@ PHP_MINIT_FUNCTION(odbc)
/* {{{ PHP_RINIT_FUNCTION */ /* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(odbc) PHP_RINIT_FUNCTION(odbc)
{ {
ODBCG(defConn) = -1;
ODBCG(num_links) = ODBCG(num_persistent); ODBCG(num_links) = ODBCG(num_persistent);
memset(ODBCG(laststate), '\0', 6); memset(ODBCG(laststate), '\0', 6);
memset(ODBCG(lasterrormsg), '\0', SQL_MAX_MESSAGE_LENGTH); memset(ODBCG(lasterrormsg), '\0', SQL_MAX_MESSAGE_LENGTH);

19
ext/odbc/php_odbc_includes.h
View file

@ -187,10 +187,10 @@
#endif #endif
typedef struct odbc_connection { typedef struct odbc_connection {
ODBC_SQL_ENV_T henv; ODBC_SQL_ENV_T henv;
ODBC_SQL_CONN_T hdbc; ODBC_SQL_CONN_T hdbc;
char laststate[6]; char laststate[6];
char lasterrormsg[SQL_MAX_MESSAGE_LENGTH]; char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
HashTable results; HashTable results;
} odbc_connection; } odbc_connection;
@ -239,12 +239,11 @@ ZEND_BEGIN_MODULE_GLOBALS(odbc)
zend_long max_links; zend_long max_links;
zend_long num_persistent; zend_long num_persistent;
zend_long num_links; zend_long num_links;
int defConn; zend_long defaultlrl;
zend_long defaultlrl; zend_long defaultbinmode;
zend_long defaultbinmode; zend_long default_cursortype;
zend_long default_cursortype; char laststate[6];
char laststate[6]; char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
/* Stores ODBC links throughout the duration of a request. The connection member may be either persistent or /* Stores ODBC links throughout the duration of a request. The connection member may be either persistent or
* non-persistent. In the former case, it is a pointer to an item in EG(persistent_list). This solution makes it * non-persistent. In the former case, it is a pointer to an item in EG(persistent_list). This solution makes it
* possible to properly free links during RSHUTDOWN (or when they are explicitly closed), while persistent * possible to properly free links during RSHUTDOWN (or when they are explicitly closed), while persistent