Fixing a few "no previous declaration" warnings

modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/value.cpp

5 files changed, 9 insertions, 5 deletions

diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 214ad8ba049..4d6889f7f8b 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -3829,7 +3829,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
           my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0));
           return HA_ERR_INTERNAL_ERROR;
           } // endif tab
-
+      default: /* do nothing */;
       } // endswitch ttp
 
   if (type == TAB_XML) {
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index e32e666e1fe..881e554163e 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -36,6 +36,7 @@
 //#include "kindex.h"
 #include "xtable.h"
 #include "tabodbc.h"
+#include "odbccat.h"
 #include "plgcnx.h"                       // For DB types
 #include "resource.h"
 #include "valblk.h"
@@ -203,7 +204,7 @@ CATPARM *AllocCatInfo(PGLOBAL g, CATINFO fid, char *tab, PQRYRES qrp)
 /***********************************************************************/
 /*  Check for nulls and reset them to Null (?) values.                 */
 /***********************************************************************/
-void ResetNullValues(CATPARM *cap)
+static void ResetNullValues(CATPARM *cap)
   {
   int      i, n, ncol;
   PCOLRES  crp;
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp
index 32ee105c19c..d0f3896bc4f 100644
--- a/storage/connect/plgdbutl.cpp
+++ b/storage/connect/plgdbutl.cpp
@@ -519,6 +519,7 @@ bool PlgSetXdbPath(PGLOBAL g, PSZ dbname, PSZ dbpath,
 /*  Extract from a path name the required component.                   */
 /*  This function assumes there is enough space in the buffer.         */
 /***********************************************************************/
+#if 0
 char *ExtractFromPath(PGLOBAL g, char *pBuff, char *FileName, OPVAL op)
   {
   char *drive = NULL, *direc = NULL, *fname = NULL, *ftype = NULL;
@@ -539,13 +540,14 @@ char *ExtractFromPath(PGLOBAL g, char *pBuff, char *FileName, OPVAL op)
   _splitpath(FileName, drive, direc, fname, ftype);
   return pBuff;
   } // end of PlgExtractFromPath
+#endif
 
 /***********************************************************************/
 /*  Check the occurence and matching of a pattern against a string.    */
 /*  Because this function is only used for catalog name checking,      */
 /*  it must be case insensitive.                                       */
 /***********************************************************************/
-bool PlugCheckPattern(PGLOBAL g, LPCSTR string, LPCSTR pat)
+static bool PlugCheckPattern(PGLOBAL g, LPCSTR string, LPCSTR pat)
   {
   if (pat && strlen(pat)) {
     // This leaves 512 bytes (MAX_STR / 2) for each components
diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c
index 693ae96cf52..2c7eaa893b6 100644
--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -491,9 +491,10 @@ void *MakePtr(void *memp, OFFSET offset)
 /***********************************************************************/
 /* This routine makes an offset from a pointer new format.             */
 /***********************************************************************/
+#if 0
 OFFSET MakeOff(void *memp, void *ptr)
   {
   return ((!ptr) ? 0 : (OFFSET)((char *)ptr - (char *)memp));
   } /* end of MakeOff */
-
+#endif
 /*--------------------- End of PLUGUTIL program -----------------------*/
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp
index 7a1146e6c32..6152fdc238f 100644
--- a/storage/connect/value.cpp
+++ b/storage/connect/value.cpp
@@ -93,7 +93,7 @@ PSZ strlwr(PSZ s);
 /*  met when returning from TestValue for a given operator.            */
 /*  Bit one is EQ, bit 2 is LT, and bit 3 is GT.                       */
 /***********************************************************************/
-BYTE OpBmp(PGLOBAL g, OPVAL opc)
+static BYTE OpBmp(PGLOBAL g, OPVAL opc)
   {
   BYTE bt;