clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

@- Ora_GetColumn()/Ora_FetchInto() now return NULL for NULL-Columns. (Thies)

Browse Source 
also changed return-type for list-dtor
This commit is contained in:
Thies C. Arntzen 2000-01-18 08:35:55 +00:00
parent df138c2e2f
commit c6df8ab565
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/oracle/oracle.c
View File

@ -36,7 +36,7 @@
#if HAVE_ORACLE
#include "php_oracle.h"
#define HASH_DTOR (int (*)(void *))
#define HASH_DTOR (void (*)(void *))
#ifdef WIN32
# include "variables.h"
@ -207,13 +207,12 @@ static int _close_oraconn(oraConnection *conn)
return 1;
}
static int
static void
pval_ora_param_destructor(oraParam *param)
{
if (param->progv) {
efree(param->progv);
}
return 1;
}
@ -1112,9 +1111,7 @@ PHP_FUNCTION(ora_fetch_into)
continue; /* don't add anything for NULL columns, unless the calles wants it */
} else {
MAKE_STD_ZVAL(tmp);
tmp->type = IS_BOOL; /* return false for NULL columns */
tmp->value.lval = 0;
ZVAL_NULL(tmp);
}
} else if (cursor->columns[i].col_retcode != 0 &&
cursor->columns[i].col_retcode != 1406) {
@ -1387,6 +1384,10 @@ PHP_FUNCTION(ora_getcolumn)
type = column->dbtype;
if (column->col_retcode == 1405) {
RETURN_NULL;
}
if (column->col_retcode != 0 && column->col_retcode != 1406) {
/* So error fetching column. The most common is 1405, a NULL
* was retreived. 1406 is ASCII or string buffer data was