Skip to content

Commit f5d0c77

Browse files
BuggynoursBuggynours
committed
Get rid of GCC warnings about unused parameters
 modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/block.h modified: storage/connect/catalog.h modified: storage/connect/colblk.cpp modified: storage/connect/colblk.h modified: storage/connect/connect.cc modified: storage/connect/filamap.cpp modified: storage/connect/filamdbf.cpp modified: storage/connect/filamfix.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamtxt.h modified: storage/connect/filamvct.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.h modified: storage/connect/ha_connect.c modified: storage/connect/jsonudf.cpp modified: storage/connect/mycat.h modified: storage/connect/myconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabcol.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabfmt.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/table.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabmysql.h modified: storage/connect/taboccur.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabtbl.h modified: storage/connect/tabutil.cpp modified: storage/connect/tabutil.h modified: storage/connect/tabvct.cpp modified: storage/connect/tabvir.cpp modified: storage/connect/tabvir.h modified: storage/connect/tabxcl.cpp modified: storage/connect/tabxcl.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h modified: storage/connect/valblk.cpp modified: storage/connect/valblk.h modified: storage/connect/value.cpp modified: storage/connect/value.h modified: storage/connect/xindex.cpp modified: storage/connect/xindex.h modified: storage/connect/xobject.h modified: storage/connect/xtable.h
1 parent 6b56e89 commit f5d0c77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+744
-769
lines changed

‎storage/connect/array.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************* Array C++ Functions Source Code File (.CPP) *************/
22
/* Name: ARRAY.CPP Version 2.3 */
33
/* */
4-
/* (C) Copyright to the author Olivier BERTRAND 2005-2014 */
4+
/* (C) Copyright to the author Olivier BERTRAND 2005-2015 */
55
/* */
66
/* This file contains the XOBJECT derived class ARRAY functions. */
77
/* ARRAY is used for elaborate type of processing, such as sorting */
@@ -848,7 +848,7 @@ void *ARRAY::GetSortIndex(PGLOBAL g)
848848
/* the indication of whether the Find will be always true, always not */
849849
/* true or other. */
850850
/***********************************************************************/
851-
int ARRAY::BlockTest(PGLOBAL g, int opc, int opm,
851+
int ARRAY::BlockTest(PGLOBAL, int opc, int opm,
852852
void *minp, void *maxp, bool s)
853853
{
854854
bool bin, bax, pin, pax, veq, all = (opm == 2);
@@ -1038,7 +1038,7 @@ void ARRAY::Print(PGLOBAL g, FILE *f, uint n)
10381038
/***********************************************************************/
10391039
/* Make string output of ARRAY contents. */
10401040
/***********************************************************************/
1041-
void ARRAY::Print(PGLOBAL g, char *ps, uint z)
1041+
void ARRAY::Print(PGLOBAL, char *ps, uint z)
10421042
{
10431043
if (z < 16)
10441044
return;

‎storage/connect/blkfil.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* COPYRIGHT: */
77
/* ---------- */
8-
/* (C) Copyright to the author Olivier BERTRAND 2004-2014 */
8+
/* (C) Copyright to the author Olivier BERTRAND 2004-2015 */
99
/* */
1010
/* WHAT THIS PROGRAM DOES: */
1111
/* ----------------------- */
@@ -56,7 +56,7 @@ BLOCKFILTER::BLOCKFILTER(PTDBDOS tdbp, int op)
5656
/***********************************************************************/
5757
/* Make file output of BLOCKFILTER contents. */
5858
/***********************************************************************/
59-
void BLOCKFILTER::Print(PGLOBAL g, FILE *f, uint n)
59+
void BLOCKFILTER::Print(PGLOBAL, FILE *f, uint n)
6060
{
6161
char m[64];
6262

@@ -70,7 +70,7 @@ void BLOCKFILTER::Print(PGLOBAL g, FILE *f, uint n)
7070
/***********************************************************************/
7171
/* Make string output of BLOCKFILTER contents. */
7272
/***********************************************************************/
73-
void BLOCKFILTER::Print(PGLOBAL g, char *ps, uint z)
73+
void BLOCKFILTER::Print(PGLOBAL, char *ps, uint z)
7474
{
7575
strncat(ps, "BlockFilter(s)", z);
7676
} // end of Print
@@ -186,7 +186,7 @@ void BLKFILARI::Reset(PGLOBAL g)
186186
/***********************************************************************/
187187
/* Evaluate block filter for arithmetic operators. */
188188
/***********************************************************************/
189-
int BLKFILARI::BlockEval(PGLOBAL g)
189+
int BLKFILARI::BlockEval(PGLOBAL)
190190
{
191191
int mincmp, maxcmp, n;
192192

@@ -306,7 +306,7 @@ void BLKFILAR2::MakeValueBitmap(void)
306306
/***********************************************************************/
307307
/* Evaluate XDB2 block filter for arithmetic operators. */
308308
/***********************************************************************/
309-
int BLKFILAR2::BlockEval(PGLOBAL g)
309+
int BLKFILAR2::BlockEval(PGLOBAL)
310310
{
311311
#if defined(_DEBUG)
312312
assert (Colp->IsClustered());
@@ -428,7 +428,7 @@ void BLKFILMR2::MakeValueBitmap(void)
428428
/***********************************************************************/
429429
/* Evaluate XDB2 block filter for arithmetic operators. */
430430
/***********************************************************************/
431-
int BLKFILMR2::BlockEval(PGLOBAL g)
431+
int BLKFILMR2::BlockEval(PGLOBAL)
432432
{
433433
#if defined(_DEBUG)
434434
assert (Colp->IsClustered());
@@ -514,7 +514,7 @@ void BLKSPCARI::Reset(PGLOBAL g)
514514
/***********************************************************************/
515515
/* Evaluate block filter for arithmetic operators (ROWID) */
516516
/***********************************************************************/
517-
int BLKSPCARI::BlockEval(PGLOBAL g)
517+
int BLKSPCARI::BlockEval(PGLOBAL)
518518
{
519519
int mincmp, maxcmp, n, m;
520520

@@ -605,7 +605,7 @@ BLKFILIN::BLKFILIN(PGLOBAL g, PTDBDOS tdbp, int op, int opm, PXOB *xp)
605605
/***********************************************************************/
606606
/* Reset: have the sorted array reset its Bot value to -1 (bottom). */
607607
/***********************************************************************/
608-
void BLKFILIN::Reset(PGLOBAL g)
608+
void BLKFILIN::Reset(PGLOBAL)
609609
{
610610
Arap->Reset();
611611
// MakeValueBitmap(); // Does nothing for class BLKFILIN
@@ -736,7 +736,7 @@ void BLKFILIN2::MakeValueBitmap(void)
736736
/* ended string in case of string argument. This is because the ARRAY */
737737
/* can have a different width than the char column. */
738738
/***********************************************************************/
739-
int BLKFILIN2::BlockEval(PGLOBAL g)
739+
int BLKFILIN2::BlockEval(PGLOBAL)
740740
{
741741
if (N < 0)
742742
return Result; // Was set in MakeValueBitmap
@@ -909,7 +909,7 @@ int BLKFILIN2::BlockEval(PGLOBAL g)
909909
/***********************************************************************/
910910
/* BLKSPCIN constructor. */
911911
/***********************************************************************/
912-
BLKSPCIN::BLKSPCIN(PGLOBAL g, PTDBDOS tdbp, int op, int opm,
912+
BLKSPCIN::BLKSPCIN(PGLOBAL, PTDBDOS tdbp, int op, int opm,
913913
PXOB *xp, int bsize)
914914
: BLOCKFILTER(tdbp, op)
915915
{
@@ -930,7 +930,7 @@ BLKSPCIN::BLKSPCIN(PGLOBAL g, PTDBDOS tdbp, int op, int opm,
930930
/***********************************************************************/
931931
/* Reset: have the sorted array reset its Bot value to -1 (bottom). */
932932
/***********************************************************************/
933-
void BLKSPCIN::Reset(PGLOBAL g)
933+
void BLKSPCIN::Reset(PGLOBAL)
934934
{
935935
Arap->Reset();
936936
} // end of Reset

‎storage/connect/block.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class DllExport BLOCK {
5050
#if !defined(__BORLANDC__)
5151
// Avoid warning C4291 by defining a matching dummy delete operator
5252
void operator delete(void *, PGLOBAL, void *) {}
53-
void operator delete(void *ptr,size_t size) {}
53+
void operator delete(void *, size_t) {}
5454
#endif
5555
virtual ~BLOCK() {}
5656

‎storage/connect/catalog.h

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*************** Catalog H Declares Source Code File (.H) **************/
22
/* Name: CATALOG.H Version 3.3 */
33
/* */
4-
/* (C) Copyright to the author Olivier BERTRAND 2000-2014 */
4+
/* (C) Copyright to the author Olivier BERTRAND 2000-2015 */
55
/* */
66
/* This file contains the CATALOG PlugDB classes definitions. */
77
/***********************************************************************/
@@ -73,33 +73,29 @@ class DllExport CATALOG {
7373
// Methods
7474
virtual void Reset(void) {}
7575
//virtual void SetDataPath(PGLOBAL g, const char *path) {}
76-
virtual bool CheckName(PGLOBAL g, char *name) {return true;}
77-
virtual bool ClearName(PGLOBAL g, PSZ name) {return true;}
78-
virtual PRELDEF MakeOneTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am) {return NULL;}
79-
virtual PRELDEF GetTableDescEx(PGLOBAL g, PTABLE tablep) {return NULL;}
80-
virtual PRELDEF GetTableDesc(PGLOBAL g, LPCSTR name, LPCSTR type,
81-
PRELDEF *prp = NULL) {return NULL;}
82-
virtual PRELDEF GetFirstTable(PGLOBAL g) {return NULL;}
83-
virtual PRELDEF GetNextTable(PGLOBAL g) {return NULL;}
84-
virtual bool TestCond(PGLOBAL g, const char *name, const char *type)
85-
{return true;}
86-
virtual bool DropTable(PGLOBAL g, PSZ name, bool erase) {return true;}
87-
virtual PTDB GetTable(PGLOBAL g, PTABLE tablep,
88-
MODE mode = MODE_READ, LPCSTR type = NULL)
89-
{return NULL;}
90-
virtual void TableNames(PGLOBAL g, char *buffer, int maxbuf, int info[]) {}
91-
virtual void ColumnNames(PGLOBAL g, char *tabname, char *buffer,
92-
int maxbuf, int info[]) {}
93-
virtual void ColumnDefs(PGLOBAL g, char *tabname, char *buffer,
94-
int maxbuf, int info[]) {}
95-
virtual void *DecodeValues(PGLOBAL g, char *tabname, char *colname,
96-
char *buffer, int maxbuf, int info[]) {return NULL;}
97-
virtual int ColumnType(PGLOBAL g, char *tabname, char *colname) {return 0;}
98-
virtual void ClearDB(PGLOBAL g) {}
76+
virtual bool CheckName(PGLOBAL, char*) {return true;}
77+
virtual bool ClearName(PGLOBAL, PSZ) {return true;}
78+
virtual PRELDEF MakeOneTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}
79+
virtual PRELDEF GetTableDescEx(PGLOBAL, PTABLE) {return NULL;}
80+
virtual PRELDEF GetTableDesc(PGLOBAL, LPCSTR, LPCSTR,
81+
PRELDEF* = NULL) {return NULL;}
82+
virtual PRELDEF GetFirstTable(PGLOBAL) {return NULL;}
83+
virtual PRELDEF GetNextTable(PGLOBAL) {return NULL;}
84+
virtual bool TestCond(PGLOBAL, const char*, const char*) {return true;}
85+
virtual bool DropTable(PGLOBAL, PSZ, bool) {return true;}
86+
virtual PTDB GetTable(PGLOBAL, PTABLE,
87+
MODE = MODE_READ, LPCSTR = NULL) {return NULL;}
88+
virtual void TableNames(PGLOBAL, char*, int, int[]) {}
89+
virtual void ColumnNames(PGLOBAL, char*, char*, int, int[]) {}
90+
virtual void ColumnDefs(PGLOBAL, char*, char*, int, int[]) {}
91+
virtual void *DecodeValues(PGLOBAL, char*, char*, char*,
92+
int, int[]) {return NULL;}
93+
virtual int ColumnType(PGLOBAL, char*, char*) {return 0;}
94+
virtual void ClearDB(PGLOBAL) {}
9995

10096
protected:
101-
virtual bool ClearSection(PGLOBAL g, const char *key, const char *section) {return true;}
102-
virtual PRELDEF MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am) {return NULL;}
97+
virtual bool ClearSection(PGLOBAL, const char*, const char*) {return true;}
98+
virtual PRELDEF MakeTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}
10399

104100
// Members
105101
char *Cbuf; /* Buffer used for col section */

0 commit comments

Comments
 (0)