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

Fix the code in these almost forgotten files.

Browse Source 
Close some B.O., fix the parameters (constness, type) and mark unused functions with our macro for that purpose.
This commit is contained in:
robocop 2008-04-26 14:45:58 +00:00
parent ec03603707
commit e593a978b8
2 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/jrd/iberr.cpp
View File

@ -31,10 +31,12 @@
#include "../jrd/gds_proto.h"
#include "../jrd/iberr_proto.h"
static void post_error(ISC_STATUS*, const SCHAR*, UCHAR*, ISC_STATUS, ...);
#ifdef NOT_USED_OR_REPLACED
static void post_error(ISC_STATUS*, const SCHAR*, const bool, ISC_STATUS, ...);
#endif
void IBERR_append_status(ISC_STATUS * status_vector, ISC_STATUS status, ...)
void IBERR_append_status(ISC_STATUS* status_vector, ISC_STATUS status, ...)
{
/**************************************
*
@ -46,25 +48,36 @@ void IBERR_append_status(ISC_STATUS * status_vector, ISC_STATUS status, ...)
* Append the given status vector with the passed arguments.
*
**************************************/
ISC_STATUS *appended, *status_end;
ISC_STATUS_ARRAY local_status;
/* First build a local status vector with the passed arguments */
// First build a local status vector with the passed arguments
STUFF_STATUS(local_status, status);
/* Now find the end of the passed status vector info */
// Now find the end of the passed status vector info
for (status_end = status_vector + ISC_STATUS_LENGTH; *status_vector; status_vector++);
ISC_STATUS* const status_end = status_vector + ISC_STATUS_LENGTH;
while (*status_vector && status_vector < status_end)
++status_vector;
// If we fail here, an unterminated, illegal status vector was passed as argument.
fb_assert(status_vector < status_end);
/* Now append the newly built local status vector to the passed one */
// Now append the newly built local status vector to the passed one
// The minimum space is for appending isc_arg_<something>, <value>, isc_arg_end.
appended = local_status;
while ((*status_vector++ = *appended++) && status_vector < status_end);
if (status_vector < status_end - 2)
{
const ISC_STATUS* appended = local_status;
while (status_vector < status_end && (*status_vector++ = *appended++))
; // empty loop
status_end[-1] = 0; // force termination
}
}
void IBERR_build_status(ISC_STATUS * status_vector, ISC_STATUS status, ...)
void IBERR_build_status(ISC_STATUS* status_vector, ISC_STATUS status, ...)
{
/**************************************
*
@ -81,10 +94,11 @@ void IBERR_build_status(ISC_STATUS * status_vector, ISC_STATUS status, ...)
}
#ifdef NOT_USED_OR_REPLACED
void IBERR_bugcheck(
ISC_STATUS * status_vector,
SCHAR * dbname,
UCHAR * longjmp_addr, int number, TEXT * errmsg)
ISC_STATUS* status_vector,
const SCHAR* dbname,
const bool raise, int number, TEXT* errmsg)
{
/**************************************
*
@ -96,16 +110,19 @@ void IBERR_bugcheck(
* Things seem to be going poorly today.
*
**************************************/
USHORT flags, len;
USHORT flags;
if (gds__msg_lookup(0, JRD_BUGCHK, number, MAX_ERRMSG_LEN, errmsg,
&flags) < 1)
strcpy(errmsg, "Internal error code");
len = strlen(errmsg);
sprintf(errmsg + len, " (%d)", number);
char strnum[20];
const size_t len1 = strlen(errmsg);
const size_t len2 = sprintf(strnum, " (%d)", number);
if (len1 + len2 < MAX_ERRMSG_LEN)
strncpy(errmsg + len1, strnum, len2 + 1);
post_error(status_vector, dbname, longjmp_addr, isc_bug_check,
post_error(status_vector, dbname, raise, isc_bug_check,
isc_arg_string, errmsg, 0);
}
@ -113,7 +130,7 @@ void IBERR_bugcheck(
void IBERR_error(
ISC_STATUS* status_vector,
const SCHAR* dbname,
UCHAR* longjmp_addr, int number, TEXT* errmsg)
const bool raise, int number, TEXT* errmsg)
{
/**************************************
*
@ -132,7 +149,7 @@ void IBERR_error(
&flags) < 1)
sprintf(errmsg, "error code %d", number);
post_error(status_vector, dbname, longjmp_addr, isc_random,
post_error(status_vector, dbname, raise, isc_random,
isc_arg_string, errmsg, 0);
}
@ -140,7 +157,7 @@ void IBERR_error(
static void post_error(
ISC_STATUS* status_vector,
const SCHAR* dbname,
UCHAR* longjmp_addr, ISC_STATUS status, ...)
const bool raise, ISC_STATUS status, ...)
{
/**************************************
*
@ -161,8 +178,9 @@ static void post_error(
gds__log_status(dbname, status_vector);
}
if (longjmp_addr) {
if (raise) {
Firebird::status_exception::raise(status_vector);
}
}
#endif

10
src/jrd/iberr_proto.h
View File

@ -24,10 +24,12 @@
#ifndef JRD_IBERR_PROTO_H
#define JRD_IBERR_PROTO_H
void IBERR_append_status(ISC_STATUS *, ISC_STATUS, ...);
void IBERR_build_status(ISC_STATUS *, ISC_STATUS, ...);
void IBERR_bugcheck(ISC_STATUS *, SCHAR *, UCHAR *, int, TEXT *);
void IBERR_error(ISC_STATUS*, const SCHAR*, UCHAR*, int, TEXT*);
void IBERR_append_status(ISC_STATUS*, ISC_STATUS, ...);
void IBERR_build_status(ISC_STATUS*, ISC_STATUS, ...);
#ifdef NOT_USED_OR_REPLACED
void IBERR_bugcheck(ISC_STATUS*, const SCHAR*, const bool, int, TEXT*);
void IBERR_error(ISC_STATUS*, const SCHAR*, const bool, int, TEXT*);
#endif
#endif // JRD_IBERR_PROTO_H