Browse Source

fixed uninitilized var in ZTS mode.

PHP-4.0.5
Thies C. Arntzen 26 years ago
parent
commit
cef6cc1ec0
  1. 9
      ext/oci8/oci8.c
  2. 2
      ext/oci8/php_oci8.h

9
ext/oci8/oci8.c

@ -317,8 +317,7 @@ CONST void ocifree(dvoid *ctx, dvoid *ptr)
static void php_oci_init_globals(OCILS_D)
{
OCI(user_num) = 1000;
OCI(server_num) = 2000;
OCI(shutdown) = 0;
OCI(user) = malloc(sizeof(HashTable));
zend_hash_init(OCI(user), 13, NULL, NULL, 1);
@ -468,8 +467,6 @@ PHP_MSHUTDOWN_FUNCTION(oci)
PHP_RSHUTDOWN_FUNCTION(oci)
{
OCILS_FETCH();
oci_debug("START php_rshutdown_oci");
#if 0
@ -700,8 +697,6 @@ _oci_descriptor_list_dtor(oci_descriptor *descr)
static void
_oci_server_list_dtor(oci_server *server)
{
ELS_FETCH();
if (server->persistent)
return;
@ -2956,8 +2951,6 @@ PHP_FUNCTION(ocinewdescriptor)
oci_descriptor *descr;
int dtype;
OCILS_FETCH();
dtype = OCI_DTYPE_LOB;
if (zend_get_parameters_ex(2, &conn, &type) == SUCCESS) {

2
ext/oci8/php_oci8.h

@ -170,9 +170,7 @@ typedef struct {
long num_links;
*/
int server_num;
HashTable *server;
int user_num;
HashTable *user;
OCIEnv *pEnv;

Loading…
Cancel
Save