cvs commit

From: thies Date: Mon Jul 12 09:27:17 1999 Modified files: php3/functions/oracle.c Log message: par with 4.0 Index: php3/functions/oracle.c diff -u php3/functions/oracle.c:1.111 php3/functions/oracle.c:1.112 --- php3/functions/oracle.c:1.111 Thu Jun 3 07:02:50 1999 +++ php3/functions/oracle.c Mon Jul 12 09:27:16 1999 @@ -58,7 +58,18 @@ #if HAVE_ORACLE -#include "oracle.h" +#if PHP_API_VERSION < 19990421 + #include "oracle.h" + #define HASH_DTOR (void (*)(void *)) +#else + #include "php3_oracle.h" + #define HASH_DTOR (int (*)(void *)) +#endif + +#ifndef ZEND_MODULE_INFO_FUNC_ARGS +#define ZEND_MODULE_INFO_FUNC_ARGS void +#endif + #ifdef WIN32 # include "variables.h" #else @@ -225,14 +236,10 @@ static int pval_ora_param_destructor(oraParam *param) { - if (! param) { - return 0; - } - if (param->progv) { efree(param->progv); } - return 0; + return 1; } @@ -517,8 +524,7 @@ if (persistent){ /*new_le.type = ORACLE_GLOBAL(php3_oracle_module).le_pconn; new_le.ptr = db_conn;*/ - return_value->value.lval = - php3_plist_insert(db_conn, ORACLE_GLOBAL(php3_oracle_module).le_pconn); + RETVAL_RESOURCE(php3_plist_insert(db_conn, ORACLE_GLOBAL(php3_oracle_module).le_pconn)); new_index_ptr.ptr = (void *) return_value->value.lval; #ifdef THREAD_SAFE new_index_ptr.type = _php3_le_index_ptr(); @@ -536,8 +542,7 @@ ORACLE_GLOBAL(php3_oracle_module).num_persistent++; } else { /* non persistent, simply add to list */ - return_value->value.lval = - php3_list_insert(db_conn, ORACLE_GLOBAL(php3_oracle_module).le_conn); + RETVAL_RESOURCE(php3_list_insert(db_conn, ORACLE_GLOBAL(php3_oracle_module).le_conn)); } ORACLE_GLOBAL(php3_oracle_module).num_links++; @@ -579,7 +584,7 @@ RETURN_FALSE; } } - return_value->value.lval = id; + RETVAL_RESOURCE(id); } } @@ -591,7 +596,6 @@ NULL); efree(hashed_details); - return_value->type = IS_LONG; } /* {{{ proto int ora_logoff(int connection) @@ -653,7 +657,7 @@ cursor->open = 1; cursor->conn_ptr = conn; cursor->conn_id = conn_ind; - RETURN_LONG(ora_add_cursor(list, cursor)); + RETURN_RESOURCE(ora_add_cursor(list, cursor)); } /* }}} */ @@ -862,7 +866,7 @@ cursor->params = (HashTable *)emalloc(sizeof(HashTable)); if (!cursor->params || _php3_hash_init(cursor->params, 19, NULL, - (void (*)(void *))pval_ora_param_destructor, 0) == FAILURE) { + HASH_DTOR pval_ora_param_destructor, 0) == FAILURE) { php3_error(E_ERROR, "Unable to initialize parameter list"); RETURN_FALSE; } @@ -1097,7 +1101,7 @@ } } - RETURN_LONG(ora_add_cursor(list, cursor)); + RETURN_RESOURCE(ora_add_cursor(list, cursor)); } /* }}} */ @@ -1222,9 +1226,7 @@ RETURN_FALSE; } else { #if PHP_API_VERSION >= 19990421 - tmp = emalloc(sizeof(pval)); - tmp->is_ref = 0; - tmp->refcount = 1; + MAKE_STD_ZVAL(tmp); #endif tmp->type = IS_STRING; @@ -1233,16 +1235,6 @@ switch(cursor->columns[i].dbtype) { case SQLT_LNG: case SQLT_LBI: -#if 0 - { - ub4 ret_len; - /* XXX 64k max for LONG and LONG RAW */ - oflng(&cursor->cda, (sword)(i + 1), cursor->columns[i].buf, DB_SIZE, 1, - &ret_len, 0); - - tmp->value.str.len = ret_len; - } -#else { ub4 ret_len; int offset = cursor->columns[i].col_retlen; @@ -1281,7 +1273,6 @@ tmp->value.str.len = 0; } } -#endif break; default: tmp->value.str.len = min(cursor->columns[i].col_retlen, @@ -1293,13 +1284,13 @@ if (flags&ORA_FETCHINTO_ASSOC){ #if PHP_API_VERSION >= 19990421 - _php3_hash_update(arr->value.ht, cursor->columns[i].cbuf, cursor->columns[i].cbufl+1, (void *) &tmp, sizeof(pval), NULL); + _php3_hash_update(arr->value.ht, cursor->columns[i].cbuf, cursor->columns[i].cbufl+1, (void *) &tmp, sizeof(pval*), NULL); #else _php3_hash_update(arr->value.ht, cursor->columns[i].cbuf, cursor->columns[i].cbufl+1, (void *) tmp, sizeof(pval), NULL); #endif } else { #if PHP_API_VERSION >= 19990421 - _php3_hash_index_update(arr->value.ht, i, (void *) &tmp, sizeof(pval), NULL); + _php3_hash_index_update(arr->value.ht, i, (void *) &tmp, sizeof(pval*), NULL); #else _php3_hash_index_update(arr->value.ht, i, (void *) tmp, sizeof(pval), NULL); #endif @@ -1643,14 +1634,14 @@ convert_to_long(arg); if ((cursor = ora_get_cursor(list, arg->value.lval)) != NULL) { - RETVAL_LONG(cursor->cda.rc); + RETURN_LONG(cursor->cda.rc); } else if ((conn = ora_get_conn(list,plist, arg->value.lval)) != NULL) { RETURN_LONG(conn->lda.rc); } } /* }}} */ -void php3_info_oracle() +void php3_info_oracle(ZEND_MODULE_INFO_FUNC_ARGS) { #if !(WIN32|WINNT) php3_printf("Oracle version: %s<br>\n" @@ -1842,8 +1833,12 @@ { char *paramname; oraParam *param; +#if PHP_API_VERSION < 19990421 pval *pdata; - int i, len; +#else + pval **pdata; +#endif + int i, len, plen; #if (WIN32|WINNT) /* see variables.c */ HashTable *symbol_table=php3i_get_symbol_table(); @@ -1907,21 +1902,31 @@ return 0; } #endif - convert_to_string(pdata); - if(param->progvl <= pdata->value.str.len){ - php3_error(E_NOTICE, "Input value will be truncated"); - } - len = min(param->progvl - 1, pdata->value.str.len); +#if PHP_API_VERSION < 19990421 + convert_to_string(pdata); + plen = pdata->value.str.len; +#else + convert_to_string(*pdata); + plen = (*pdata)->value.str.len; +#endif + if (param->progvl <= plen){ + php3_error(E_NOTICE, "Input value will be truncated"); + } - strncpy(param->progv, pdata->value.str.val, len); + len = min(param->progvl - 1, plen); +#if PHP_API_VERSION < 19990421 + strncpy(param->progv, pdata->value.str.val, len); +#else + strncpy(param->progv, (*pdata)->value.str.val, len); +#endif param->progv[len] = '\0'; efree(paramname); } + return 1; - } #endif /* HAVE_ORACLE */