 |
 |
 |
 |
|
|
Date: 06/26/98
- Next message: ssb: "[PHP-DEV] CVS update: php31/ext/gd"
- Previous message: Rasmus Lerdorf: "Re: [PHP-DEV] Error in php3_hash / memory manager?"
- Next in thread: zeev: "[PHP-DEV] CVS update: php31/ext/oracle"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Friday June 26, 1998 @ 9:23
Author: ssb
Update of /repository/php31/ext/oracle
In directory asf:/tmp/cvs-serv7323
Modified Files:
oracle.c
Log Message:
undo the hash -> _php3_hash changes for now
Index: php31/ext/oracle/oracle.c
diff -c php31/ext/oracle/oracle.c:1.4 php31/ext/oracle/oracle.c:1.5
*** php31/ext/oracle/oracle.c:1.4 Fri Jun 26 09:21:18 1998
--- php31/ext/oracle/oracle.c Fri Jun 26 09:23:40 1998
***************
*** 207,213 ****
ORACLE_TLS_VARS;
conn->open = 0;
! _php3_hash_apply(ORACLE_GLOBAL(php3_oracle_module).resource_list,
(int (*)(void *))_cursors_cleanup);
ologof(&conn->lda);
--- 207,213 ----
ORACLE_TLS_VARS;
conn->open = 0;
! hash_apply(ORACLE_GLOBAL(php3_oracle_module).resource_list,
(int (*)(void *))_cursors_cleanup);
ologof(&conn->lda);
***************
*** 221,227 ****
ORACLE_TLS_VARS;
conn->open = 0;
! _php3_hash_apply(ORACLE_GLOBAL(php3_oracle_module).resource_plist,
(int (*)(void *))_cursors_cleanup);
ologof(&conn->lda);
--- 221,227 ----
ORACLE_TLS_VARS;
conn->open = 0;
! hash_apply(ORACLE_GLOBAL(php3_oracle_module).resource_plist,
(int (*)(void *))_cursors_cleanup);
ologof(&conn->lda);
***************
*** 239,245 ****
efree(cur->query);
}
if (cur->params){
! _php3_hash_destroy(cur->params);
}
if (cur->columns){
for(i = 0; i < cur->ncols; i++){
--- 239,245 ----
efree(cur->query);
}
if (cur->params){
! hash_destroy(cur->params);
}
if (cur->columns){
for(i = 0; i < cur->ncols; i++){
***************
*** 449,455 ****
* no matter if it is to be persistent or not
*/
! if (_php3_hash_find(plist, hashed_details, hashed_len + 1,
(void **) &index_ptr) == FAILURE) {
/* the link is not in the persistent list */
list_entry new_index_ptr;
--- 449,455 ----
* no matter if it is to be persistent or not
*/
! if (hash_find(plist, hashed_details, hashed_len + 1,
(void **) &index_ptr) == FAILURE) {
/* the link is not in the persistent list */
list_entry new_index_ptr;
***************
*** 485,491 ****
php3_plist_insert(db_conn, ORACLE_GLOBAL(php3_oracle_module).le_pconn);
new_index_ptr.ptr = (void *) return_value->value.lval;
new_index_ptr.type = le_index_ptr;
! if (_php3_hash_update(plist,hashed_details,hashed_len + 1,(void *) &new_index_ptr,
sizeof(list_entry),NULL) == FAILURE) {
ologof(&db_conn->lda);
free(db_conn);
--- 485,491 ----
php3_plist_insert(db_conn, ORACLE_GLOBAL(php3_oracle_module).le_pconn);
new_index_ptr.ptr = (void *) return_value->value.lval;
new_index_ptr.type = le_index_ptr;
! if (hash_update(plist,hashed_details,hashed_len + 1,(void *) &new_index_ptr,
sizeof(list_entry),NULL) == FAILURE) {
ologof(&db_conn->lda);
free(db_conn);
***************
*** 525,531 ****
/* Delete list entry for this connection */
php3_plist_delete(id);
/* Delete hashed list entry for this dead connection */
! _php3_hash_del(plist, hashed_details, hashed_len);
efree(hashed_details);
RETURN_FALSE;
}
--- 525,531 ----
/* Delete list entry for this connection */
php3_plist_delete(id);
/* Delete hashed list entry for this dead connection */
! hash_del(plist, hashed_details, hashed_len);
efree(hashed_details);
RETURN_FALSE;
}
***************
*** 737,743 ****
cursor->query = query;
cursor->fetched = 0;
if(cursor->params && cursor->nparams > 0){
! _php3_hash_destroy(cursor->params);
efree(cursor->params);
cursor->params = NULL;
cursor->nparams = 0;
--- 737,743 ----
cursor->query = query;
cursor->fetched = 0;
if(cursor->params && cursor->nparams > 0){
! hash_destroy(cursor->params);
efree(cursor->params);
cursor->params = NULL;
cursor->nparams = 0;
***************
*** 779,785 ****
if(cursor->params == NULL){
cursor->params = (HashTable *)emalloc(sizeof(HashTable));
if (!cursor->params ||
! _php3_hash_init(cursor->params, 19, NULL,
(void (*)(void *))yystype_ora_param_destructor, 0) ==
FAILURE){
php3_error(E_ERROR, "Unable to initialize parameter list");
--- 779,785 ----
if(cursor->params == NULL){
cursor->params = (HashTable *)emalloc(sizeof(HashTable));
if (!cursor->params ||
! hash_init(cursor->params, 19, NULL,
(void (*)(void *))yystype_ora_param_destructor, 0) ==
FAILURE){
php3_error(E_ERROR, "Unable to initialize parameter list");
***************
*** 797,804 ****
RETURN_FALSE;
}
! if (_php3_hash_add(cursor->params, paramname, argv[1]->value.str.len + 1, newparam, sizeof(oraParam), (void **)¶mptr) == FAILURE) {
! /* XXX _php3_hash_destroy */
efree(paramname);
efree(newparam);
php3_error(E_ERROR, "Could not make parameter placeholder");
--- 797,804 ----
RETURN_FALSE;
}
! if (hash_add(cursor->params, paramname, argv[1]->value.str.len + 1, newparam, sizeof(oraParam), (void **)¶mptr) == FAILURE) {
! /* XXX hash_destroy */
efree(paramname);
efree(newparam);
php3_error(E_ERROR, "Could not make parameter placeholder");
***************
*** 1096,1102 ****
}
tmp.value.str.val = estrndup(cursor->columns[i].buf, tmp.value.str.len);
}
! _php3_hash_index_update(arr->value.ht, i, (void *) &tmp, sizeof(pval), NULL);
}
RETURN_LONG(cursor->ncols);
--- 1096,1102 ----
}
tmp.value.str.val = estrndup(cursor->columns[i].buf, tmp.value.str.len);
}
! hash_index_update(arr->value.ht, i, (void *) &tmp, sizeof(pval), NULL);
}
RETURN_LONG(cursor->ncols);
***************
*** 1575,1593 ****
oraParam *param;
pval *pdata;
int i, len;
! _php3_hash_internal_pointer_reset(cursor->params);
! if(_php3_hash_num_elements(cursor->params) != cursor->nparams){
php3_error(E_WARNING, "Mismatch in number of parameters");
return 0;
}
! for(i = 0; i < cursor->nparams; i++, _php3_hash_move_forward(cursor->params)){
! if(_php3_hash_get_current_key(cursor->params, ¶mname, NULL) != HASH_KEY_IS_STRING){
php3_error(E_WARNING, "Can't get parameter name");
return 0;
}
! if(_php3_hash_get_current_data(cursor->params, (void **)¶m) == FAILURE){
php3_error(E_WARNING, "Can't get parameter data");
return 0;
}
--- 1575,1593 ----
oraParam *param;
pval *pdata;
int i, len;
! hash_internal_pointer_reset(cursor->params);
! if(hash_num_elements(cursor->params) != cursor->nparams){
php3_error(E_WARNING, "Mismatch in number of parameters");
return 0;
}
! for(i = 0; i < cursor->nparams; i++, hash_move_forward(cursor->params)){
! if(hash_get_current_key(cursor->params, ¶mname, NULL) != HASH_KEY_IS_STRING){
php3_error(E_WARNING, "Can't get parameter name");
return 0;
}
! if(hash_get_current_data(cursor->params, (void **)¶m) == FAILURE){
php3_error(E_WARNING, "Can't get parameter data");
return 0;
}
***************
*** 1602,1608 ****
continue;
}
! if(_php3_hash_find(&GLOBAL(symbol_table), paramname, strlen(paramname) + 1, (void **)&pdata) == FAILURE){
php3_error(E_WARNING, "Can't find variable for parameter");
return 0;
}
--- 1602,1608 ----
continue;
}
! if(hash_find(&GLOBAL(symbol_table), paramname, strlen(paramname) + 1, (void **)&pdata) == FAILURE){
php3_error(E_WARNING, "Can't find variable for parameter");
return 0;
}
***************
*** 1651,1657 ****
php3_error(E_WARNING, "Out of memory");
return -1;
}
! if (_php3_hash_init(cursor->params, 19, NULL,
(void (*)(void *))yystype_ora_param_destructor, 0) ==
FAILURE){
php3_error(E_WARNING, "Unable to initialize parameter list");
--- 1651,1657 ----
php3_error(E_WARNING, "Out of memory");
return -1;
}
! if (hash_init(cursor->params, 19, NULL,
(void (*)(void *))yystype_ora_param_destructor, 0) ==
FAILURE){
php3_error(E_WARNING, "Unable to initialize parameter list");
***************
*** 1660,1666 ****
return -1;
}
}
! _php3_hash_add(curs->params, start, namelen, ptr, size, (void **)&pDest)
}
#endif
--- 1660,1666 ----
return -1;
}
}
! hash_add(curs->params, start, namelen, ptr, size, (void **)&pDest)
}
#endif
- Next message: ssb: "[PHP-DEV] CVS update: php31/ext/gd"
- Previous message: Rasmus Lerdorf: "Re: [PHP-DEV] Error in php3_hash / memory manager?"
- Next in thread: zeev: "[PHP-DEV] CVS update: php31/ext/oracle"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]