CONNECT: compiler warnings

6 files changed, 23 insertions, 13 deletions

diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp
index 84a686cc145..3c736941b6f 100644
--- a/storage/connect/array.cpp
+++ b/storage/connect/array.cpp
@@ -599,10 +599,12 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp)
   /*  Converting STRING to DATE can be done according to date format.  */
   /*********************************************************************/
   if (Type == TYPE_DATE && ovblp->GetType() == TYPE_STRING && vp)
+  {
     if (((DTVAL*)Value)->SetFormat(g, vp))
       return TYPE_ERROR;
     else
       b = true;  // Sort the new array on date internal values
+  }
 
   /*********************************************************************/
   /*  Do the actual conversion.                                        */
diff --git a/storage/connect/colblk.cpp b/storage/connect/colblk.cpp
index a9cf43f3d96..e42d9703ad7 100644
--- a/storage/connect/colblk.cpp
+++ b/storage/connect/colblk.cpp
@@ -79,7 +79,7 @@ COLBLK::COLBLK(PCOL col1, PTDB tdbp)
   if (trace(2))
     htrc(" copying COLBLK %s from %p to %p\n", Name, col1, this);
 
-  if (tdbp)
+  if (tdbp) {
     // Attach the new column to the table block
     if (!tdbp->GetColumns())
       tdbp->SetColumns(this);
@@ -88,6 +88,7 @@ COLBLK::COLBLK(PCOL col1, PTDB tdbp)
 
       colp->Next = this;
       } // endelse
+  }
 
   } // end of COLBLK copy constructor
 
diff --git a/storage/connect/filamzip.cpp b/storage/connect/filamzip.cpp
index 8968078e9b1..79599382693 100644
--- a/storage/connect/filamzip.cpp
+++ b/storage/connect/filamzip.cpp
@@ -147,7 +147,6 @@ static bool ZipFile(PGLOBAL g, ZIPUTIL *zutp, PCSZ fn, PCSZ entry, char *buf)
 static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
 {
 	char filename[_MAX_PATH];
-	int  rc;
 
 	/*********************************************************************/
 	/*  pat is a multiple file name with wildcard characters             */
@@ -155,6 +154,7 @@ static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
 	strcpy(filename, pat);
 
 #if defined(__WIN__)
+	int  rc;
 	char   drive[_MAX_DRIVE], direc[_MAX_DIR];
 	WIN32_FIND_DATA FileData;
 	HANDLE hSearch;
@@ -1207,7 +1207,7 @@ int UZDFAM::Cardinality(PGLOBAL g)
 		return 1;
 
 	int card = -1;
-	int len = GetFileLength(g);
+	GetFileLength(g);
 
 	card = Records;
 
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index 58b0267bd6d..0966477cbfd 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -378,7 +378,7 @@ bool LIBXMLDOC::Initialize(PGLOBAL g, PCSZ entry, bool zipped)
 	if (zipped && InitZip(g, entry))
 		return true;
 
-  int n = xmlKeepBlanksDefault(1);
+  xmlKeepBlanksDefault(1);
   return MakeNSlist(g);
 } // end of Initialize
 
diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp
index 9a1e43dd798..e592d0016bf 100644
--- a/storage/connect/tabfmt.cpp
+++ b/storage/connect/tabfmt.cpp
@@ -311,12 +311,13 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info)
 
       } else if (*p == q) {
         if (phase == 0) {
-          if (blank)
+          if (blank) {
             if (++nerr > mxr) {
               sprintf(g->Message, MSG(MISPLACED_QUOTE), num_read);
               goto err;
             } else
               goto skip;
+          }
 
           n = 0;
           phase = digit = 1;
@@ -341,12 +342,13 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info)
           goto skip;
 
       } else {
-        if (phase == 2)
+        if (phase == 2) {
           if (++nerr > mxr) {
             sprintf(g->Message, MSG(MISPLACED_QUOTE), num_read);
             goto err;
           } else
             goto skip;
+        }
 
         // isdigit cannot be used here because of debug assert
         if (!strchr("0123456789", *p)) {
@@ -362,12 +364,13 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info)
         blank = 1;
       } // endif's *p
 
-    if (phase == 1)
+    if (phase == 1) {
       if (++nerr > mxr) {
         sprintf(g->Message, MSG(UNBALANCE_QUOTE), num_read);
         goto err;
       } else
         goto skip;
+    }
 
     if (n) {
       len[i] = MY_MAX(len[i], n);
@@ -741,7 +744,7 @@ bool TDBCSV::OpenDB(PGLOBAL g)
     int     i, len;
     PCSVCOL colp;
 
-    if (!Fields)              // May have been set in TABFMT::OpenDB
+    if (!Fields) {            // May have been set in TABFMT::OpenDB
       if (Mode != MODE_UPDATE && Mode != MODE_INSERT) {
         for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next)
           if (!colp->IsSpecial() && !colp->IsVirtual())
@@ -754,6 +757,7 @@ bool TDBCSV::OpenDB(PGLOBAL g)
         for (cdp = tdp->GetCols(); cdp; cdp = cdp->GetNext())
           if (!cdp->IsSpecial() && !cdp->IsVirtual())
             Fields++;
+    }
 
     Offset = (int*)PlugSubAlloc(g, NULL, sizeof(int) * Fields);
     Fldlen = (int*)PlugSubAlloc(g, NULL, sizeof(int) * Fields);
@@ -774,7 +778,7 @@ bool TDBCSV::OpenDB(PGLOBAL g)
 
       } // endfor i
 
-    if (Field)
+    if (Field) {
       // Prepare writing fields
       if (Mode != MODE_UPDATE) {
         for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next)
@@ -797,6 +801,7 @@ bool TDBCSV::OpenDB(PGLOBAL g)
             Fldlen[i] = len;
             Fldtyp[i] = IsTypeNum(cdp->GetType());
             } // endif cdp
+    }
 
     } // endif Use
 
@@ -1046,7 +1051,7 @@ bool TDBCSV::PrepareWriting(PGLOBAL g)
     if (i)
       strcat(To_Line, sep);
 
-    if (Field[i])
+    if (Field[i]) {
       if (!strlen(Field[i])) {
         // Generally null fields are not quoted
         if (Quoted > 2)
@@ -1054,7 +1059,7 @@ bool TDBCSV::PrepareWriting(PGLOBAL g)
           strcat(strcat(To_Line, qot), qot);
 
       } else if (Qot && (strchr(Field[i], Sep) || *Field[i] == Qot
-              || Quoted > 1 || (Quoted == 1 && !Fldtyp[i])))
+              || Quoted > 1 || (Quoted == 1 && !Fldtyp[i]))) {
         if (strchr(Field[i], Qot)) {
           // Field contains quotes that must be doubled
           int j, k = strlen(To_Line), n = strlen(Field[i]);
@@ -1072,9 +1077,11 @@ bool TDBCSV::PrepareWriting(PGLOBAL g)
           To_Line[k] = '\0';
         } else
           strcat(strcat(strcat(To_Line, qot), Field[i]), qot);
+      }
 
       else
         strcat(To_Line, Field[i]);
+    }
 
     } // endfor i
 
diff --git a/storage/connect/tabvir.cpp b/storage/connect/tabvir.cpp
index c78a8f531f6..2fdb7f64744 100644
--- a/storage/connect/tabvir.cpp
+++ b/storage/connect/tabvir.cpp
@@ -168,13 +168,13 @@ int TDBVIR::TestFilter(PFIL filp, bool nop)
           } // endswitch op
 
 			if (!nop) switch (op) {
-		    case OP_LT:	l1--;
+		    case OP_LT:	l1--; /* fall through */
 				case OP_LE: limit = l1;   break;
 				default: ok = false;
 				} // endswitch op
 
 			else switch (op) {
-		    case OP_GE:	l1--;
+		    case OP_GE:	l1--; /* fall through */
 				case OP_GT: limit = l1;   break;
 				default: ok = false;
 				} // endswitch op