CVS update: php3/functions

Date: Thursday June 3, 1999 @ 5:21 Author: thies Update of /repository/php3/functions In directory php:/tmp/cvs-serv18221/functions Modified Files: oracle.c Log Message: apologies! something in the damn oci7 has not made it's way into my brain! had to "reimplement" the 64K limit for LONG/LONG raw in oracle.c (there was a huge mem-overwrite). Index: php3/functions/oracle.c diff -u php3/functions/oracle.c:1.109 php3/functions/oracle.c:1.110 --- php3/functions/oracle.c:1.109 Wed Jun 2 03:48:56 1999 +++ php3/functions/oracle.c Thu Jun 3 05:21:32 1999 @@ -1233,6 +1233,16 @@ switch(cursor->columns[i].dbtype) { case SQLT_LNG: case SQLT_LBI: +#if 1 + { + 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 = 0; @@ -1269,6 +1279,7 @@ tmp->value.str.len = 0; } } +#endif break; default: tmp->value.str.len = min(cursor->columns[i].col_retlen, @@ -1535,6 +1546,15 @@ RETURN_STRINGL(column->buf, min(column->col_retlen, column->dsize), 1); case SQLT_LNG: case SQLT_LBI: +#if 1 + { + ub4 ret_len; + /* XXX 64k max for LONG and LONG RAW */ + oflng(&cursor->cda, (sword)(colno + 1), column->buf, DB_SIZE, 1, + &ret_len, 0); + RETURN_STRINGL(column->buf, ret_len, 1); + } +#else { ub4 ret_len; int offset = 0; @@ -1571,6 +1591,7 @@ RETURN_FALSE; } } +#endif default: php3_error(E_WARNING, "Ora_GetColumn found invalid type (%d)", type);