mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fix gcc compiler warnings reported by Sergei
modified: storage/connect/array.cpp modified: storage/connect/array.h modified: storage/connect/blkfil.cpp modified: storage/connect/blkfil.h modified: storage/connect/block.h modified: storage/connect/colblk.cpp modified: storage/connect/colblk.h modified: storage/connect/csort.h modified: storage/connect/filamvct.cpp modified: storage/connect/filter.cpp modified: storage/connect/filter.h modified: storage/connect/global.h modified: storage/connect/json.h modified: storage/connect/plgdbsem.h modified: storage/connect/plgdbutl.cpp modified: storage/connect/tabcol.cpp modified: storage/connect/tabcol.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabjson.cpp modified: storage/connect/table.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/tabodbc.h modified: storage/connect/tabsys.h modified: storage/connect/tabxml.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.cpp modified: storage/connect/xobject.h modified: storage/connect/xtable.h Set values as nullable when retrieving catalog info modified: storage/connect/jdbconn.cpp modified: storage/connect/mysql-test/connect/r/odbc_oracle.result modified: storage/connect/odbconn.cpp Change format of Jpath modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/mysql-test/connect/r/json.result modified: storage/connect/mysql-test/connect/r/json_udf.result modified: storage/connect/mysql-test/connect/r/json_udf_bin.result modified: storage/connect/mysql-test/connect/r/zip.result modified: storage/connect/mysql-test/connect/t/json.test modified: storage/connect/mysql-test/connect/t/json_udf.test modified: storage/connect/mysql-test/connect/t/json_udf_bin.test modified: storage/connect/mysql-test/connect/t/zip.test modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/tabmgo.cpp Change null representation from ??? to <null> modified: storage/connect/json.cpp Change the name of UDF that are equal to a native JSON function name modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/mysql-test/connect/t/json_udf.inc modified: storage/connect/mysql-test/connect/t/json_udf2.inc Fix bug in making JSON project info modified: storage/connect/mongofam.cpp Fix COMPUTE when one argument is null modified: storage/connect/value.cpp Value is null only when nullable modified: storage/connect/value.h
This commit is contained in:
Olivier Bertrand
@@ -1,7 +1,7 @@
|
||||
/************ Xobject C++ Functions Source Code File (.CPP) ************/
|
||||
/* Name: XOBJECT.CPP Version 2.4 */
|
||||
/* Name: XOBJECT.CPP Version 2.5 */
|
||||
/* */
|
||||
/* (C) Copyright to the author Olivier BERTRAND 1998-2014 */
|
||||
/* (C) Copyright to the author Olivier BERTRAND 1998-2017 */
|
||||
/* */
|
||||
/* This file contains base XOBJECT class functions. */
|
||||
/* Also here is the implementation of the CONSTANT class. */
|
||||
@@ -84,7 +84,7 @@ double XOBJECT::GetFloatValue(void)
|
||||
CONSTANT::CONSTANT(PGLOBAL g, void *value, short type)
|
||||
{
|
||||
if (!(Value = AllocateValue(g, value, (int)type)))
|
||||
longjmp(g->jumper[g->jump_level], TYPE_CONST);
|
||||
throw TYPE_CONST;
|
||||
|
||||
Constant = true;
|
||||
} // end of CONSTANT constructor
|
||||
@@ -95,7 +95,7 @@ CONSTANT::CONSTANT(PGLOBAL g, void *value, short type)
|
||||
CONSTANT::CONSTANT(PGLOBAL g, int n)
|
||||
{
|
||||
if (!(Value = AllocateValue(g, &n, TYPE_INT)))
|
||||
longjmp(g->jumper[g->jump_level], TYPE_CONST);
|
||||
throw TYPE_CONST;
|
||||
|
||||
Constant = true;
|
||||
} // end of CONSTANT constructor
|
||||
@@ -117,7 +117,7 @@ void CONSTANT::Convert(PGLOBAL g, int newtype)
|
||||
{
|
||||
if (Value->GetType() != newtype)
|
||||
if (!(Value = AllocateValue(g, Value, newtype)))
|
||||
longjmp(g->jumper[g->jump_level], TYPE_CONST);
|
||||
throw TYPE_CONST;
|
||||
|
||||
} // end of Convert
|
||||
|
||||
@@ -173,18 +173,18 @@ bool CONSTANT::Rephrase(PGLOBAL g, PSZ work)
|
||||
/***********************************************************************/
|
||||
/* Make file output of a constant object. */
|
||||
/***********************************************************************/
|
||||
void CONSTANT::Print(PGLOBAL g, FILE *f, uint n)
|
||||
void CONSTANT::Printf(PGLOBAL g, FILE *f, uint n)
|
||||
{
|
||||
Value->Print(g, f, n);
|
||||
} /* end of Print */
|
||||
Value->Printf(g, f, n);
|
||||
} /* end of Printf */
|
||||
|
||||
/***********************************************************************/
|
||||
/* Make string output of a constant object. */
|
||||
/***********************************************************************/
|
||||
void CONSTANT::Print(PGLOBAL g, char *ps, uint z)
|
||||
void CONSTANT::Prints(PGLOBAL g, char *ps, uint z)
|
||||
{
|
||||
Value->Print(g, ps, z);
|
||||
} /* end of Print */
|
||||
Value->Prints(g, ps, z);
|
||||
} /* end of Prints */
|
||||
|
||||
/* -------------------------- Class STRING --------------------------- */
|
||||
|
||||
@@ -192,7 +192,7 @@ void CONSTANT::Print(PGLOBAL g, char *ps, uint z)
|
||||
/* STRING public constructor for new char values. Alloc Size must be */
|
||||
/* calculated because PlugSubAlloc rounds up size to multiple of 8. */
|
||||
/***********************************************************************/
|
||||
STRING::STRING(PGLOBAL g, uint n, char *str)
|
||||
STRING::STRING(PGLOBAL g, uint n, PCSZ str)
|
||||
{
|
||||
G = g;
|
||||
Length = (str) ? strlen(str) : 0;
|
||||
@@ -205,10 +205,12 @@ STRING::STRING(PGLOBAL g, uint n, char *str)
|
||||
|
||||
Next = GetNext();
|
||||
Size = Next - Strp;
|
||||
Trc = false;
|
||||
} else {
|
||||
// This should normally never happen
|
||||
Next = NULL;
|
||||
Size = 0;
|
||||
Trc = true;
|
||||
} // endif Strp
|
||||
|
||||
} // end of STRING constructor
|
||||
@@ -229,6 +231,7 @@ char *STRING::Realloc(uint len)
|
||||
if (!p) {
|
||||
// No more room in Sarea; this is very unlikely
|
||||
strcpy(G->Message, "No more room in work area");
|
||||
Trc = true;
|
||||
return NULL;
|
||||
} // endif p
|
||||
|
||||
@@ -243,7 +246,7 @@ char *STRING::Realloc(uint len)
|
||||
/***********************************************************************/
|
||||
/* Set a STRING new PSZ value. */
|
||||
/***********************************************************************/
|
||||
bool STRING::Set(PSZ s)
|
||||
bool STRING::Set(PCSZ s)
|
||||
{
|
||||
if (!s)
|
||||
return false;
|
||||
@@ -333,9 +336,9 @@ bool STRING::Append(const char *s, uint ln, bool nq)
|
||||
} // end of Append
|
||||
|
||||
/***********************************************************************/
|
||||
/* Append a PSZ to a STRING. */
|
||||
/* Append a PCSZ to a STRING. */
|
||||
/***********************************************************************/
|
||||
bool STRING::Append(PSZ s)
|
||||
bool STRING::Append(PCSZ s)
|
||||
{
|
||||
if (!s)
|
||||
return false;
|
||||
@@ -392,11 +395,11 @@ bool STRING::Append(char c)
|
||||
/***********************************************************************/
|
||||
/* Append a quoted PSZ to a STRING. */
|
||||
/***********************************************************************/
|
||||
bool STRING::Append_quoted(PSZ s)
|
||||
bool STRING::Append_quoted(PCSZ s)
|
||||
{
|
||||
bool b = Append('\'');
|
||||
|
||||
if (s) for (char *p = s; !b && *p; p++)
|
||||
if (s) for (const char *p = s; !b && *p; p++)
|
||||
switch (*p) {
|
||||
case '\'':
|
||||
case '\\':
|
||||
|
||||
Reference in New Issue
Block a user