8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 08:03:03 +01:00

Warnings.

This commit is contained in:
robocop 2011-04-03 03:03:23 +00:00
parent 311e68d53a
commit 6a201351e0
4 changed files with 9 additions and 8 deletions

View File

@ -318,7 +318,7 @@ void HashJoin::print(thread_db* tdbb, string& plan, bool detailed, unsigned leve
{ {
plan += printIndent(++level) + "Hash Join (inner)"; plan += printIndent(++level) + "Hash Join (inner)";
m_leader->print(tdbb, plan, true, level); m_leader->print(tdbb, plan, true, level);
for (int i = 0; i < m_args.getCount(); i++) for (size_t i = 0; i < m_args.getCount(); i++)
{ {
m_args[i]->print(tdbb, plan, true, level); m_args[i]->print(tdbb, plan, true, level);
} }
@ -329,7 +329,7 @@ void HashJoin::print(thread_db* tdbb, string& plan, bool detailed, unsigned leve
plan += "HASH ("; plan += "HASH (";
m_leader->print(tdbb, plan, false, level); m_leader->print(tdbb, plan, false, level);
plan += ", "; plan += ", ";
for (int i = 0; i < m_args.getCount(); i++) for (size_t i = 0; i < m_args.getCount(); i++)
{ {
if (i) if (i)
{ {

View File

@ -366,7 +366,7 @@ void MergeJoin::print(thread_db* tdbb, string& plan, bool detailed, unsigned lev
if (detailed) if (detailed)
{ {
plan += printIndent(++level) + "Merge Join (inner)"; plan += printIndent(++level) + "Merge Join (inner)";
for (int i = 0; i < m_args.getCount(); i++) for (size_t i = 0; i < m_args.getCount(); i++)
{ {
m_args[i]->print(tdbb, plan, true, level); m_args[i]->print(tdbb, plan, true, level);
} }
@ -375,7 +375,7 @@ void MergeJoin::print(thread_db* tdbb, string& plan, bool detailed, unsigned lev
{ {
level++; level++;
plan += "MERGE ("; plan += "MERGE (";
for (int i = 0; i < m_args.getCount(); i++) for (size_t i = 0; i < m_args.getCount(); i++)
{ {
if (i) if (i)
{ {

View File

@ -225,7 +225,7 @@ void NestedLoopJoin::print(thread_db* tdbb, string& plan, bool detailed, unsigne
{ {
plan += printIndent(++level) + " Nested Loop Join "; plan += printIndent(++level) + " Nested Loop Join ";
plan += m_semiJoin ? "(semi)" : m_antiJoin ? "(anti)" : m_outerJoin ? "(outer)" : "(inner)"; plan += m_semiJoin ? "(semi)" : m_antiJoin ? "(anti)" : m_outerJoin ? "(outer)" : "(inner)";
for (int i = 0; i < m_args.getCount(); i++) for (size_t i = 0; i < m_args.getCount(); i++)
{ {
m_args[i]->print(tdbb, plan, true, level); m_args[i]->print(tdbb, plan, true, level);
} }
@ -234,7 +234,7 @@ void NestedLoopJoin::print(thread_db* tdbb, string& plan, bool detailed, unsigne
{ {
level++; level++;
plan += "JOIN ("; plan += "JOIN (";
for (int i = 0; i < m_args.getCount(); i++) for (size_t i = 0; i < m_args.getCount(); i++)
{ {
if (i) if (i)
{ {

View File

@ -54,7 +54,8 @@ static inline void ch_stuff(BLOB_PTR*& p, const UCHAR value, bool& same_flag)
{ {
if (*p == value) if (*p == value)
p++; p++;
else { else
{
*p++ = value; *p++ = value;
same_flag = false; same_flag = false;
} }
@ -654,7 +655,7 @@ ISC_STATUS UTLD_parse_sqlda(ISC_STATUS* status,
return error_dsql_804(status, isc_dsql_sqlda_value_err); return error_dsql_804(status, isc_dsql_sqlda_value_err);
// Copy data - unless known to be NULL // Copy data - unless known to be NULL
if ((offset + len) > pClause->msgBuffer.getCount()) if (size_t(offset) + len > pClause->msgBuffer.getCount())
return error_dsql_804(status, isc_dsql_sqlda_value_err); return error_dsql_804(status, isc_dsql_sqlda_value_err);
if (!*null_ind) if (!*null_ind)