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

Some string handling changes + fixed Alpha 3 bug + misc.

Browse Source
This commit is contained in:
dimitr 2005-08-14 12:41:16 +00:00
parent 53e1c4f954
commit 298614484b
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/jrd/exe.cpp
View File

@ -3794,7 +3794,11 @@ static void set_error(thread_db* tdbb, const xcp_repeat* exception, jrd_nod* msg
case xcp_xcp_code:
// CVC: If we have the exception name, use it instead of the number.
// Solves SF Bug #494981.
MET_lookup_exception(tdbb, exception->xcp_code, name, temp, sizeof(temp));
MET_lookup_exception(tdbb, exception->xcp_code,
name, temp, sizeof(temp));
if (!name.length())
name = exception->xcp_code;
if (message[0])
s = message;
else if (temp[0])
@ -3802,20 +3806,16 @@ static void set_error(thread_db* tdbb, const xcp_repeat* exception, jrd_nod* msg
else
s = NULL;
char nr[20];
const char* nameOrNumber = nr;
if (name.length())
nameOrNumber = name.c_str();
else
sprintf(nr, "%d", exception->xcp_code);
if (s)
ERR_post(isc_except,
isc_arg_string, ERR_cstring(nameOrNumber),
isc_arg_string, ERR_cstring(name.c_str()),
isc_arg_gds, isc_random, isc_arg_string, ERR_cstring(s),
0);
else
ERR_post(isc_except, isc_arg_string, ERR_cstring(nameOrNumber), 0);
ERR_post(isc_except, isc_arg_string, ERR_cstring(name.c_str()), 0);
default:
fb_assert(false);
}
}
@ -4153,16 +4153,30 @@ static bool test_and_fixup_error(thread_db* tdbb, const PsqlException* condition
break;
case xcp_xcp_code:
{
// Look at set_error() routine to understand how the
// exception ID info is encoded inside the status vector.
Firebird::MetaName name;
MET_lookup_exception(tdbb, conditions->xcp_rpt[i].xcp_code,
name, NULL, 0);
if (!name.length())
name = conditions->xcp_rpt[i].xcp_code;
if ((status_vector[1] == isc_except) &&
(status_vector[3] == conditions->xcp_rpt[i].xcp_code))
(name == (char*)(IPTR) status_vector[3]))
{
found = true;
}
}
break;
case xcp_default:
found = true;
break;
default:
fb_assert(false);
}
if (found)