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

Added more diagnostics in DEV_BUILD. If you find it reasonable, can be internationalized and added to release too.

Browse Source
This commit is contained in:
alexpeshkoff 2011-04-13 12:39:44 +00:00
parent 87bb408afc
commit 7d1b48f122
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/dsql/dsql.cpp
View File

@ -1518,7 +1518,11 @@ static void map_in_out(dsql_req* request, bool toExternal, const dsql_msg* messa
if (err || count) if (err || count)
{ {
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
Arg::Gds(isc_dsql_sqlda_err)); Arg::Gds(isc_dsql_sqlda_err)
#ifdef DEV_BUILD
<< Arg::Gds(isc_random) << (err ? "Message buffer too short" : "Wrong number of message parameters")
#endif
);
} }
const DsqlCompiledStatement* statement = request->getStatement(); const DsqlCompiledStatement* statement = request->getStatement();
@ -1625,7 +1629,11 @@ static USHORT parse_blr(dsql_req* request, ULONG blr_length, const UCHAR* blr,
if (*blr != blr_version4 && *blr != blr_version5) if (*blr != blr_version4 && *blr != blr_version5)
{ {
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
Arg::Gds(isc_dsql_sqlda_err)); Arg::Gds(isc_dsql_sqlda_err)
#ifdef DEV_BUILD
<< Arg::Gds(isc_random) << "Wrong BLR version"
#endif
);
} }
blr++; // skip the blr_version blr++; // skip the blr_version
@ -1633,7 +1641,11 @@ static USHORT parse_blr(dsql_req* request, ULONG blr_length, const UCHAR* blr,
if (*blr++ != blr_begin || *blr++ != blr_message) if (*blr++ != blr_begin || *blr++ != blr_message)
{ {
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
Arg::Gds(isc_dsql_sqlda_err)); Arg::Gds(isc_dsql_sqlda_err)
#ifdef DEV_BUILD
<< Arg::Gds(isc_random) << "Missing blr_begin / blr_message"
#endif
);
} }
++blr; // skip the message number ++blr; // skip the message number
@ -1752,7 +1764,11 @@ static USHORT parse_blr(dsql_req* request, ULONG blr_length, const UCHAR* blr,
default: default:
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
Arg::Gds(isc_dsql_sqlda_err)); Arg::Gds(isc_dsql_sqlda_err)
#ifdef DEV_BUILD
<< Arg::Gds(isc_random) << "Wrong BLR type"
#endif
);
} }
USHORT align = type_alignments[desc.dsc_dtype]; USHORT align = type_alignments[desc.dsc_dtype];
@ -1765,7 +1781,11 @@ static USHORT parse_blr(dsql_req* request, ULONG blr_length, const UCHAR* blr,
if (*blr++ != blr_short || *blr++ != 0) if (*blr++ != blr_short || *blr++ != 0)
{ {
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
Arg::Gds(isc_dsql_sqlda_err)); Arg::Gds(isc_dsql_sqlda_err)
#ifdef DEV_BUILD
<< Arg::Gds(isc_random) << "Wrong BLR type for NULL indicator"
#endif
);
} }
align = type_alignments[dtype_short]; align = type_alignments[dtype_short];
@ -1805,7 +1825,11 @@ static USHORT parse_blr(dsql_req* request, ULONG blr_length, const UCHAR* blr,
if (*blr++ != (UCHAR) blr_end || offset != msg_length) if (*blr++ != (UCHAR) blr_end || offset != msg_length)
{ {
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
Arg::Gds(isc_dsql_sqlda_err)); Arg::Gds(isc_dsql_sqlda_err)
#ifdef DEV_BUILD
<< Arg::Gds(isc_random) << (offset != msg_length ? "Invalid message length" : "Missing blr_end")
#endif
);
} }
return count; return count;