CVS update: php3/functions

Date: Wednesday May 5, 1999 @ 1:54 Author: thies Update of /repository/php3/functions In directory php:/tmp/cvs-serv20811 Modified Files: oci8.c Log Message: working on leaks & connection stuff Index: php3/functions/oci8.c diff -u php3/functions/oci8.c:1.87 php3/functions/oci8.c:1.88 --- php3/functions/oci8.c:1.87 Tue May 4 11:24:39 1999 +++ php3/functions/oci8.c Wed May 5 01:53:59 1999 @@ -33,7 +33,7 @@ #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.87 1999/05/04 15:24:39 thies Exp $ */ +/* $Id: oci8.c,v 1.88 1999/05/05 05:53:59 thies Exp $ */ /* TODO list: * @@ -1708,10 +1708,7 @@ free(hashed_details); return session; } else { - if (session) { - _oci8_close_user(session); - free(session); - } + _oci8_close_user(session); /* breakthru to open */ } } @@ -1812,6 +1809,10 @@ session->num = OCI8_GLOBAL(php3_oci8_module).user_num++; + session->open = 1; + + oci8_debug("oci8_open_user new sess=%d user=%s",session->num,session->hashed_details); + if (exclusive) { _php3_hash_next_index_insert(OCI8_GLOBAL(php3_oci8_module).user, (void *) session, @@ -1826,19 +1827,12 @@ (void **) &session); } - oci8_debug("oci8_open_user new sess=%d user=%s",session->num,session->hashed_details); - - session->open = 1; - return session; CLEANUP: oci8_debug("oci8_open_user: FAILURE -> CLEANUP called"); - if (session) { - _oci8_close_user(session); - free(session); - } + _oci8_close_user(session); return 0; } @@ -1912,11 +1906,11 @@ if (session->pError) OCIHandleFree((dvoid *) session->pError, (ub4) OCI_HTYPE_ERROR); - _php3_hash_del(OCI8_GLOBAL(php3_oci8_module).user,session->hashed_details,session->hashed_details_length+1); - if (session->hashed_details) { free(session->hashed_details); } + + free(session); } /* }}} */ @@ -1969,10 +1963,7 @@ return server; } else { /* server "died" in the meantime - try to reconnect! */ - if (server) { - _oci8_close_server(server); - free(server); - } + _oci8_close_server(server); /* breakthru to open */ } } @@ -2015,13 +2006,10 @@ server->num = OCI8_GLOBAL(php3_oci8_module).server_num++; - _php3_hash_update(OCI8_GLOBAL(php3_oci8_module).server, - hashed_details, - hashed_details_length+1, - (void *) server, - sizeof(oci8_server), - (void **) &server); + server->open = 1; + + /* server->failover.fo_ctx = (dvoid *) server; server->failover.callback_function = oci8_failover_callback; @@ -2036,20 +2024,24 @@ oci8_error(server->pError, "oci8_open_server OCIAttrSet OCI_ATTR_FOCBK", error); goto CLEANUP; } + */ oci8_debug("oci8_open_server new conn=%d dname=%s",server->num,server->dbname); - server->open = 1; + _php3_hash_update(OCI8_GLOBAL(php3_oci8_module).server, + hashed_details, + hashed_details_length+1, + (void *) server, + sizeof(oci8_server), + (void **) &server); + return server; CLEANUP: oci8_debug("oci8_open_server: FAILURE -> CLEANUP called"); - if (server) { - _oci8_close_server(server); - free(server); - } + _oci8_close_server(server); return 0; } @@ -2092,13 +2084,11 @@ if (server->pError) OCIHandleFree((dvoid *) server->pError, (ub4) OCI_HTYPE_ERROR); - _php3_hash_del(OCI8_GLOBAL(php3_oci8_module).server,server->hashed_details,server->hashed_details_length+1); - if (server->hashed_details) { free(server->hashed_details); } - - //XXX free(server); + + free(server); } /* }}} */ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net