CVS update: php3/functions

Date: Thursday May 6, 1999 @ 3:58 Author: thies Update of /repository/php3/functions In directory php:/tmp/cvs-serv15591/functions Modified Files: oracle.c oracle.h Log Message: we no longer need to remember list & plist - this seems to solve one problem running in cgi-mode (at least for me;-) Index: php3/functions/oracle.c diff -u php3/functions/oracle.c:1.103 php3/functions/oracle.c:1.104 --- php3/functions/oracle.c:1.103 Fri Apr 30 14:59:55 1999 +++ php3/functions/oracle.c Thu May 6 03:58:37 1999 @@ -94,7 +94,7 @@ #define ORA_FETCHINTO_ASSOC (1<<0) #define ORA_FETCHINTO_NULLS (1<<1) -static oraConnection *ora_get_conn(HashTable *, int); +static oraConnection *ora_get_conn(HashTable *,HashTable *, int); static int ora_add_cursor(HashTable *, oraCursor *); static oraCursor *ora_get_cursor(HashTable *, int); static void ora_del_cursor(HashTable *, int); @@ -447,8 +447,10 @@ int hashed_len, len, id; ORACLE_TLS_VARS; + /* ORACLE_GLOBAL(php3_oracle_module).resource_list = list; ORACLE_GLOBAL(php3_oracle_module).resource_plist = plist; + */ if (getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -634,7 +636,7 @@ convert_to_long(arg); conn_ind = arg->value.lval; - conn = ora_get_conn(list, conn_ind); + conn = ora_get_conn(list,plist, conn_ind); if (conn == NULL) { RETURN_FALSE; } @@ -685,7 +687,7 @@ } convert_to_long(arg); - conn = ora_get_conn(list, arg->value.lval); + conn = ora_get_conn(list,plist, arg->value.lval); if (conn == NULL) { RETURN_FALSE; } @@ -710,7 +712,7 @@ } convert_to_long(arg); - if (!(conn = ora_get_conn(list, arg->value.lval))) { + if (!(conn = ora_get_conn(list,plist, arg->value.lval))) { RETURN_FALSE; } @@ -735,7 +737,7 @@ } convert_to_long(arg); - conn = ora_get_conn(list, arg->value.lval); + conn = ora_get_conn(list,plist, arg->value.lval); if (conn == NULL) { RETURN_FALSE; } @@ -760,7 +762,7 @@ } convert_to_long(arg); - conn = ora_get_conn(list, arg->value.lval); + conn = ora_get_conn(list,plist, arg->value.lval); if (conn == NULL) { RETURN_FALSE; } @@ -1032,7 +1034,7 @@ convert_to_long(argv[0]); convert_to_string(argv[1]); - conn = ora_get_conn(list, argv[0]->value.lval); + conn = ora_get_conn(list,plist, argv[0]->value.lval); if (conn == NULL) { RETURN_FALSE; } @@ -1535,7 +1537,7 @@ return_value->type = IS_STRING; return_value->value.str.val = estrdup(ora_error(&cursor->cda)); return_value->value.str.len = strlen(return_value->value.str.val); - } else if ((conn = ora_get_conn(list, arg->value.lval)) != NULL) { + } else if ((conn = ora_get_conn(list,plist, arg->value.lval)) != NULL) { return_value->type = IS_STRING; return_value->value.str.val = estrdup(ora_error(&conn->lda)); return_value->value.str.len = strlen(return_value->value.str.val); @@ -1558,7 +1560,7 @@ convert_to_long(arg); if ((cursor = ora_get_cursor(list, arg->value.lval)) != NULL) { RETVAL_LONG(cursor->cda.rc); - } else if ((conn = ora_get_conn(list, arg->value.lval)) != NULL) { + } else if ((conn = ora_get_conn(list,plist, arg->value.lval)) != NULL) { RETURN_LONG(conn->lda.rc); } } @@ -1580,14 +1582,11 @@ */ static oraConnection * -ora_get_conn(HashTable *list, int ind) +ora_get_conn(HashTable *list,HashTable *plist,int ind) { oraConnection *conn = NULL; int type; - HashTable *plist; ORACLE_TLS_VARS; - - plist = ORACLE_GLOBAL(php3_oracle_module).resource_plist; conn = (oraConnection *)php3_list_find(ind, &type); if (conn && type == ORACLE_GLOBAL(php3_oracle_module).le_conn) Index: php3/functions/oracle.h diff -u php3/functions/oracle.h:1.37 php3/functions/oracle.h:1.38 --- php3/functions/oracle.h:1.37 Fri Apr 30 05:49:23 1999 +++ php3/functions/oracle.h Thu May 6 03:58:38 1999 @@ -1,4 +1,4 @@ -/* $Id: oracle.h,v 1.37 1999/04/30 09:49:23 thies Exp $ */ +/* $Id: oracle.h,v 1.38 1999/05/06 07:58:38 thies Exp $ */ #ifndef _PHP3_ORACLE_H #define _PHP3_ORACLE_H @@ -106,8 +106,6 @@ long num_persistent; long num_links; int le_conn, le_pconn, le_cursor; - HashTable *resource_list; - HashTable *resource_plist; } oracle_module; extern void php3_Ora_Bind(INTERNAL_FUNCTION_PARAMETERS); -- 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