fixed ZTS buidl - still some WS pollution left

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 435a77116c28adb87c1c8d3fac404398429f6d5f..abe06151db80ccb7d005c2d748e2fb1260397cd3 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1314,7 +1314,6 @@ oci_execute(oci_statement *statement, char *func,ub4 mode)
        int dtype;
        dvoid *buf;
        oci_descriptor *descr;
-       OCILS_FETCH();
 
        statement->error = 
                oci_error(statement->pError,
@@ -4337,6 +4336,7 @@ PHP_FUNCTION(ocicollappend)
     int inx;
        double ndx;
     ub4 loblen;
+       OCILS_FETCH();
 
     if ((id = getThis()) != 0) {
         if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
@@ -4445,6 +4445,7 @@ PHP_FUNCTION(ocicolldategetelem)
        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 @@ PHP_FUNCTION(ocicolldateassignelem)
        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 @@ PHP_FUNCTION(ocicolldateappendelem)
        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 @@ PHP_FUNCTION(ocicollgetelem)
     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 @@ PHP_FUNCTION(ocicollassign)
     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 @@ PHP_FUNCTION(ocicollassignelem)
     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 @@ PHP_FUNCTION(ocicollsize)
     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 @@ PHP_FUNCTION(ocicollmax)
     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 @@ PHP_FUNCTION(ocicolltrim)
     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 @@ PHP_FUNCTION(ocinewcollection)
     oci_connection *connection;
     oci_collection *coll;
     OCISvcCtx *svchp = 0;
-
     int dtype;
+       OCILS_FETCH();
 
     dtype = OCI_DTYPE_LOB;