diff options
| author | Thies C. Arntzen <thies@php.net> | 2000-07-15 14:54:04 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2000-07-15 14:54:04 +0000 |
| commit | cef6cc1ec08f3efbc2de46a4807fcb9a47d63729 (patch) | |
| tree | 62cc1967a7fcba9761fa1daf4638a4a4bbf8c479 | |
| parent | 23b56e3c643fc7771cc4add5eb02d7f7392b33b2 (diff) | |
| download | php-git-cef6cc1ec08f3efbc2de46a4807fcb9a47d63729.tar.gz | |
fixed uninitilized var in ZTS mode.
| -rw-r--r-- | ext/oci8/oci8.c | 9 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 269db7a10e..56b91fb717 100644 --- a/ext/oci8/oci8.c +++ b/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) { diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index a1dfbfbb8d..5441122cad 100644 --- a/ext/oci8/php_oci8.h +++ b/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; |