firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:43:03 +01:00
Code Issues

warnings

Browse Source
This commit is contained in:
alexpeshkoff 2011-01-21 17:16:13 +00:00
parent c8bcf1e7d6
commit fc41c54a62
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsql/ExprNodes.cpp
View File

@ -4797,7 +4797,7 @@ ValueExprNode* FieldNode::pass1(thread_db* tdbb, CompilerScratch* csb)
if (!map)
{
map = local_map;
fb_assert(stream + 2 <= MAX_STREAMS);
fb_assert(stream + 2u <= MAX_STREAMS);
local_map[0] = (UCHAR) stream;
map[1] = stream + 1;
map[2] = stream + 2;

2
src/dsql/Nodes.h
View File

@ -53,7 +53,7 @@ const int MAX_CONJUNCTS = 32000;
// limit is NOT negotiable so long as we use an array of UCHAR, where index 0
// tells how many streams are in the array (and the streams themselves are
// identified by a UCHAR).
const int MAX_STREAMS = 255;
const unsigned int MAX_STREAMS = 255;
// This is number of ULONG's needed to store bit-mapped flags for all streams
// OPT_STREAM_BITS = (MAX_STREAMS + 1) / sizeof(ULONG)

4
src/dsql/StmtNodes.cpp
View File

@ -3851,8 +3851,8 @@ DmlNode* ModifyNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch* c
if (context >= csb->csb_rpt.getCount() || !(csb->csb_rpt[context].csb_flags & csb_used))
PAR_error(csb, Arg::Gds(isc_ctxnotdef));
const SSHORT orgStream = csb->csb_rpt[context].csb_stream;
const SSHORT newStream = csb->nextStream(false);
const USHORT orgStream = csb->csb_rpt[context].csb_stream;
const USHORT newStream = csb->nextStream(false);
if (newStream >= MAX_STREAMS)
PAR_error(csb, Arg::Gds(isc_too_many_contexts));

4
src/dsql/parse.y
View File

@ -6887,7 +6887,7 @@ int Parser::yylexAux()
gds__free (buffer);
yyabandon(-104, isc_token_too_long);
}
else if (p - buffer > MAX_SQL_IDENTIFIER_LEN)
else if (p > &buffer[MAX_SQL_IDENTIFIER_LEN])
{
if (buffer != string)
gds__free (buffer);
@ -7415,7 +7415,7 @@ int Parser::yylexAux()
return sym->sym_keyword;
}
if (p - string > MAX_SQL_IDENTIFIER_LEN)
if (p > &string[MAX_SQL_IDENTIFIER_LEN])
yyabandon(-104, isc_dyn_name_longer);
yylval.legacyNode = (dsql_nod*) MAKE_string(string, p - string);