- Remove some gcc warnings

modified:
  storage/connect/filamvct.cpp
  storage/connect/ha_connect.cc

storage/connect/filamvct.cpp

@@ -387,15 +387,20 @@ bool VCTFAM::MakeEmptyFile(PGLOBAL g, char *fn)
 
   n = (Header == 1 || Header == 3) ? sizeof(VECHEADER) : 0;
 
-  if (lseek(h, n + MaxBlk * Nrec * Lrecl - 1, SEEK_SET) == -1) {
-    sprintf(g->Message, MSG(MAKE_EMPTY_FILE), To_File, strerror(errno));
-    close(h);
-    return true;
-    } // endif h
+  if (lseek(h, n + MaxBlk * Nrec * Lrecl - 1, SEEK_SET) < 0)
+    goto err;
+
+  // This actually fills the empty file
+  if (write(h, &c, 1) < 0)     
+    goto err;
 
-  write(h, &c, 1);     // This actually fills the empty file
   close(h);
   return false;
+  
+ err:
+  sprintf(g->Message, MSG(MAKE_EMPTY_FILE), To_File, strerror(errno));
+  close(h);
+  return true;
   } // end of MakeEmptyFile
 
 /***********************************************************************/
@@ -3392,15 +3397,20 @@ bool BGVFAM::MakeEmptyFile(PGLOBAL g, char *fn)
     htrc("MEF: pos=%lld n=%d maxblk=%d blksize=%d\n",
                pos, n, MaxBlk, Blksize);
 
-  if (lseek64(h, pos, SEEK_SET) < 0) {
-    sprintf(g->Message, MSG(MAKE_EMPTY_FILE), To_File, strerror(errno));
-    close(h);
-    return true;
-    } // endif h
+  if (lseek64(h, pos, SEEK_SET) < 0)
+    goto err;
 
-  write(h, &c, 1);     // This actually fills the empty file
+  // This actually fills the empty file
+  if (write(h, &c, 1) < 0)
+    goto err;
+       
   close(h);
   return false;
+  
+ err:
+  sprintf(g->Message, MSG(MAKE_EMPTY_FILE), To_File, strerror(errno));
+  close(h);
+  return true;
 #endif  // !WIN32
   } // end of MakeEmptyFile
 

storage/connect/ha_connect.cc

@@ -207,17 +207,18 @@ static my_bool indx_map= 0;
 /*  Utility functions.                                                 */
 /***********************************************************************/
 PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info);
-void PushWarning(PGLOBAL g, THD *thd, int level);
-bool CheckSelf(PGLOBAL g, TABLE_SHARE *s, const char *host,
-                   const char *db, char *tab, const char *src, int port);
-
+void    PushWarning(PGLOBAL g, THD *thd, int level);
+bool    CheckSelf(PGLOBAL g, TABLE_SHARE *s, const char *host,
+                  const char *db, char *tab, const char *src, int port);
+bool    ExactInfo(void);
+USETEMP UseTemp(void);
 
 static PCONNECT GetUser(THD *thd, PCONNECT xp);
 static PGLOBAL  GetPlug(THD *thd, PCONNECT& lxp);
 
 static handler *connect_create_handler(handlerton *hton,
-                                   TABLE_SHARE *table,
-                                   MEM_ROOT *mem_root);
+                                       TABLE_SHARE *table,
+                                       MEM_ROOT *mem_root);
 
 static int connect_assisted_discovery(handlerton *hton, THD* thd,
                                       TABLE_SHARE *table_s,