cvs: php4 /ext/oci8 oci8.c php_oci8.h

thies Fri May 4 07:53:46 2001 EDT Modified files: /php4/ext/oci8 oci8.c php_oci8.h Log: namespace-protect "open" Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.121 php4/ext/oci8/oci8.c:1.122 --- php4/ext/oci8/oci8.c:1.121 Mon Apr 30 05:43:37 2001 +++ php4/ext/oci8/oci8.c Fri May 4 07:53:45 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.121 2001/04/30 12:43:37 andi Exp $ */ +/* $Id: oci8.c,v 1.122 2001/05/04 14:53:45 thies Exp $ */ /* TODO list: * @@ -577,7 +577,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.121 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.122 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -850,9 +850,9 @@ case 22: /* ORA-00022 Invalid session id */ case 1012: /* ORA-01012: */ case 3113: /* ORA-03113: end-of-file on communication channel */ - connection->open = 0; - connection->session->open = 0; - connection->session->server->open = 0; + connection->is_open = 0; + connection->session->is_open = 0; + connection->session->server->is_open = 0; return 1; /* fatal error */ } @@ -953,7 +953,7 @@ connection = (oci_connection *) zend_fetch_resource(conn, -1, "OCI8-Connection", NULL, 1, le_conn); - if (connection && connection->open) { + if (connection && connection->is_open) { return connection; } else { return (oci_connection *) NULL; @@ -969,7 +969,7 @@ statement = (oci_statement *) zend_fetch_resource(stmt, -1, "OCI8-Statement", NULL, 1, le_stmt); - if (statement && statement->conn->open) { + if (statement && statement->conn->is_open) { return statement; } else { return (oci_statement *) NULL; @@ -2006,7 +2006,7 @@ zend_hash_find(OCI(user), hashed_details, strlen(hashed_details)+1, (void **) &session); if (session) { - if (session->open) { + if (session->is_open) { if (persistent) { session->persistent = 1; } @@ -2119,7 +2119,7 @@ } psession->num = zend_list_insert(psession,le_session); - psession->open = 1; + psession->is_open = 1; oci_debug("_oci_open_session new sess=%d user=%s",psession->num,username); @@ -2152,7 +2152,7 @@ oci_debug("START _oci_close_session: logging-off sess=%d",session->num); - if (session->open) { + if (session->is_open) { /* Temporary Service Context */ OCI(error) = OCIHandleAlloc(OCI(pEnv), @@ -2241,10 +2241,10 @@ /* XXX ini-flag */ /* if (! oci_ping(pserver)) { - pserver->open = 0; + pserver->is_open = 0; } */ - if (pserver->open) { + if (pserver->is_open) { /* if our new users uses this connection persistent, we're keeping it! */ if (persistent) { pserver->persistent = persistent; @@ -2288,7 +2288,7 @@ (void**)&pserver); pserver->num = zend_list_insert(pserver,le_server); - pserver->open = 1; + pserver->is_open = 1; oci_debug("_oci_open_server new conn=%d dname=%s",server->num,server->dbname); @@ -2331,7 +2331,7 @@ list_entry *le = (list_entry *) data; if (le->type == le_session) { oci_server *server = ((oci_session*) le->ptr)->server; - if (server->open == 2) + if (server->is_open == 2) return 1; } return 0; @@ -2346,18 +2346,18 @@ OCILS_FETCH(); ELS_FETCH(); - oldopen = server->open; - server->open = 2; + oldopen = server->is_open; + server->is_open = 2; if (! OCI(shutdown)) { zend_hash_apply(&EG(regular_list),_oci_session_cleanup); } - server->open = oldopen; + server->is_open = oldopen; oci_debug("START _oci_close_server: detaching conn=%d dbname=%s",server->num,server->dbname); /* XXX close server here */ - if (server->open) { + if (server->is_open) { if (server->pServer && OCI(pError)) { OCI(error) = OCIServerDetach(server->pServer, @@ -2508,7 +2508,7 @@ connection->id = zend_list_insert(connection, le_conn); - connection->open = 1; + connection->is_open = 1; oci_debug("oci_do_connect: id=%d",connection->id); @@ -3907,7 +3907,7 @@ OCI_GET_CONN(connection,conn); - connection->open = 0; + connection->is_open = 0; zend_hash_apply(list,(int (*)(void *))_stmt_cleanup); Index: php4/ext/oci8/php_oci8.h diff -u php4/ext/oci8/php_oci8.h:1.15 php4/ext/oci8/php_oci8.h:1.16 --- php4/ext/oci8/php_oci8.h:1.15 Wed Apr 25 10:44:07 2001 +++ php4/ext/oci8/php_oci8.h Fri May 4 07:53:45 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_oci8.h,v 1.15 2001/04/25 17:44:07 asautins Exp $ */ +/* $Id: php_oci8.h,v 1.16 2001/05/04 14:53:45 thies Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_H @@ -47,7 +47,7 @@ typedef struct { int num; int persistent; - int open; + int is_open; char *dbname; OCIServer *pServer; #if 0 @@ -58,7 +58,7 @@ typedef struct { int num; int persistent; - int open; + int is_open; int exclusive; char *hashed_details; oci_server *server; @@ -67,7 +67,7 @@ typedef struct { int id; - int open; + int is_open; oci_session *session; OCISvcCtx *pServiceContext; sword error;