database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fixing a few "no previous declaration" warnings

Browse Source 
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/value.cpp
This commit is contained in:
Alexander Barkov
2013-05-13 15:23:24 +04:00
parent d22b1a0b35
commit 35a879d06d
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/ha_connect.cc
View File

@@ -3829,7 +3829,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0)); my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0));
return HA_ERR_INTERNAL_ERROR; return HA_ERR_INTERNAL_ERROR;
} // endif tab } // endif tab
default: /* do nothing */;
} // endswitch ttp } // endswitch ttp
if (type == TAB_XML) { if (type == TAB_XML) {

3
storage/connect/odbconn.cpp
View File

@@ -36,6 +36,7 @@
//#include "kindex.h" //#include "kindex.h"
#include "xtable.h" #include "xtable.h"
#include "tabodbc.h" #include "tabodbc.h"
#include "odbccat.h"
#include "plgcnx.h" // For DB types #include "plgcnx.h" // For DB types
#include "resource.h" #include "resource.h"
#include "valblk.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. */ /* Check for nulls and reset them to Null (?) values. */
/***********************************************************************/ /***********************************************************************/
void ResetNullValues(CATPARM *cap) static void ResetNullValues(CATPARM *cap)
{ {
int i, n, ncol; int i, n, ncol;
PCOLRES crp; PCOLRES crp;

4
storage/connect/plgdbutl.cpp
View File

@@ -519,6 +519,7 @@ bool PlgSetXdbPath(PGLOBAL g, PSZ dbname, PSZ dbpath,
/* Extract from a path name the required component. */ /* Extract from a path name the required component. */
/* This function assumes there is enough space in the buffer. */ /* This function assumes there is enough space in the buffer. */
/***********************************************************************/ /***********************************************************************/
#if 0
char *ExtractFromPath(PGLOBAL g, char *pBuff, char *FileName, OPVAL op) char *ExtractFromPath(PGLOBAL g, char *pBuff, char *FileName, OPVAL op)
{ {
char *drive = NULL, *direc = NULL, *fname = NULL, *ftype = NULL; 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); _splitpath(FileName, drive, direc, fname, ftype);
return pBuff; return pBuff;
} // end of PlgExtractFromPath } // end of PlgExtractFromPath
#endif
/***********************************************************************/ /***********************************************************************/
/* Check the occurence and matching of a pattern against a string. */ /* Check the occurence and matching of a pattern against a string. */
/* Because this function is only used for catalog name checking, */ /* Because this function is only used for catalog name checking, */
/* it must be case insensitive. */ /* 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)) { if (pat && strlen(pat)) {
// This leaves 512 bytes (MAX_STR / 2) for each components // This leaves 512 bytes (MAX_STR / 2) for each components

3
storage/connect/plugutil.c
View File

@@ -491,9 +491,10 @@ void *MakePtr(void *memp, OFFSET offset)
/***********************************************************************/ /***********************************************************************/
/* This routine makes an offset from a pointer new format. */ /* This routine makes an offset from a pointer new format. */
/***********************************************************************/ /***********************************************************************/
#if 0
OFFSET MakeOff(void *memp, void *ptr) OFFSET MakeOff(void *memp, void *ptr)
{ {
return ((!ptr) ? 0 : (OFFSET)((char *)ptr - (char *)memp)); return ((!ptr) ? 0 : (OFFSET)((char *)ptr - (char *)memp));
} /* end of MakeOff */ } /* end of MakeOff */
#endif
/*--------------------- End of PLUGUTIL program -----------------------*/ /*--------------------- End of PLUGUTIL program -----------------------*/

2
storage/connect/value.cpp
View File

@@ -93,7 +93,7 @@ PSZ strlwr(PSZ s);
/* met when returning from TestValue for a given operator. */ /* met when returning from TestValue for a given operator. */
/* Bit one is EQ, bit 2 is LT, and bit 3 is GT. */ /* 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; BYTE bt;