cvs: php4 /ext/oci8 oci8.c

thies Mon Apr 23 04:54:02 2001 EDT Modified files: /php4/ext/oci8 oci8.c Log: fixed ZTS buidl - still some WS pollution left Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.118 php4/ext/oci8/oci8.c:1.119 --- php4/ext/oci8/oci8.c:1.118 Thu Apr 19 15:00:34 2001 +++ php4/ext/oci8/oci8.c Mon Apr 23 04:54:02 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.118 2001/04/19 22:00:34 jason Exp $ */ +/* $Id: oci8.c,v 1.119 2001/04/23 11:54:02 thies Exp $ */ /* TODO list: * @@ -584,7 +584,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.118 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.119 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -1314,7 +1314,6 @@ int dtype; dvoid *buf; oci_descriptor *descr; - OCILS_FETCH(); statement->error = oci_error(statement->pError, @@ -4337,6 +4336,7 @@ int inx; double ndx; ub4 loblen; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4445,6 +4445,7 @@ int ocifmt_len; char *ocilang; int ocilang_len; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4538,6 +4539,7 @@ int ocifmt_len; char *ocilang; int ocilang_len; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4637,6 +4639,7 @@ int ocifmt_len; char *ocilang; int ocilang_len; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4724,6 +4727,7 @@ char buff[1024]; int len; double dnum; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4809,6 +4813,7 @@ text *str; char buff[1024]; double dnum; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4858,6 +4863,7 @@ text *str; char buff[1024]; double dnum; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4964,6 +4970,7 @@ oci_collection *coll; sb4 sz; int inx; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -4986,6 +4993,7 @@ oci_collection *coll; sb4 sz; int inx; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -5008,6 +5016,7 @@ oci_collection *coll; sb4 sz; int inx; + OCILS_FETCH(); if ((id = getThis()) != 0) { if ((inx = _oci_get_ocicoll(id,&coll)) == 0) { @@ -5041,8 +5050,8 @@ oci_connection *connection; oci_collection *coll; OCISvcCtx *svchp = 0; - int dtype; + OCILS_FETCH(); dtype = OCI_DTYPE_LOB;