From f5a2d6aea12a243ab7f3c337ae8c9e8b0b78c653 Mon Sep 17 00:00:00 2001 From: dimitr Date: Fri, 25 Oct 2002 14:08:44 +0000 Subject: [PATCH] Removed duplicated files. Absolutely the same ones still exist in /jrd. --- src/misc/status.cpp | 133 -------------------------------------------- src/misc/status.h | 18 ------ 2 files changed, 151 deletions(-) delete mode 100644 src/misc/status.cpp delete mode 100644 src/misc/status.h diff --git a/src/misc/status.cpp b/src/misc/status.cpp deleted file mode 100644 index 34e0cfaf89..0000000000 --- a/src/misc/status.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// status.cpp -// -// Copyright 2001 Mikael Nordell -// -// This file is part of the firebird RDBMS engine, and as such -// is only allowed to be used within that engine, where it may -// be used freely. Any other use is prohibited. -// - -#include "firebird.h" -#include -#include -#include -#include "../misc/status.h" -#include "../jrd/gdsassert.h" -#include "gen/codes.h" -#include "../jrd/gds_proto.h" - - -/* The following function is used to stuff variable number of error message - arguments from stack to the status_vector. This macro should be the - first statement in a routine where it is invoked. */ - -/* Get the addresses of the argument vector and the status vector, and do - word-wise copy. */ - -void STUFF_STATUS_function(STATUS* status_vector, STATUS status, va_list args) -{ - int type, len; - - STATUS* p = status_vector; - - *p++ = gds_arg_gds; - *p++ = status; - - while ((type = va_arg(args, int)) && ((p - status_vector) < 17)) - { - switch (*p++ = type) - { - case gds_arg_gds: - *p++ = va_arg(args, STATUS); - break; - - case gds_arg_string: - { - STATUS* q = va_arg(args, STATUS*); - if (strlen((TEXT *) q) >= MAX_ERRSTR_LEN) - { - *(p - 1) = gds_arg_cstring; - *p++ = (STATUS) MAX_ERRSTR_LEN; - } - *p++ = (STATUS) q; - } - break; - - case gds_arg_interpreted: - *p++ = (STATUS) va_arg(args, TEXT *); - break; - - case gds_arg_cstring: - len = (int) va_arg(args, int); - *p++ = (STATUS) (len >= MAX_ERRSTR_LEN) ? MAX_ERRSTR_LEN : len; - *p++ = (STATUS) va_arg(args, TEXT *); - break; - - case gds_arg_number: - *p++ = (STATUS) va_arg(args, SLONG); - break; - - case gds_arg_vms: - case gds_arg_unix: - case gds_arg_dos: - case gds_arg_mpexl: - case gds_arg_next_mach: - case gds_arg_netware: - case gds_arg_win32: - default: - *p++ = (STATUS) va_arg(args, int); - break; - } - } - *p = gds_arg_end; -} - - -/** Check that we never overrun the status vector. The status - * vector is 20 elements. The maximum is 3 entries for a - * type. So check for 17 or less - */ - -void PARSE_STATUS(STATUS * status_vector, int &length, int &warning) -{ - warning = 0; - length = 0; - - int i = 0; - - for (; status_vector[i] != gds_arg_end; i++, length++) - { - switch (status_vector[i]) - { - case isc_arg_warning: - if (!warning) - warning = i; // find the very first - // fallthrought intended - case gds_arg_gds: - case gds_arg_string: - case gds_arg_number: - case gds_arg_vms: - case gds_arg_unix: - case gds_arg_dos: - case gds_arg_mpexl: - case gds_arg_next_mach: - case gds_arg_netware: - case gds_arg_win32: - i++; - length++; - break; - - case gds_arg_cstring: - i += 2; - length += 2; - break; - - default: - assert(FALSE); - break; - } - } - if (i) { - length++; // gds_arg_end is counted - } -} diff --git a/src/misc/status.h b/src/misc/status.h deleted file mode 100644 index 5415797d19..0000000000 --- a/src/misc/status.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef FB_MISC_STATUS_H -#define FB_MISC_STATUS_H - -#include // size_t -#include "../jrd/common.h" // STATUS - -#define MAX_ERRMSG_LEN 128 -#define MAX_ERRSTR_LEN 255 - -#ifdef __cplusplus -/* only allow these functions from C++ code (use of reference) */ - -void STUFF_STATUS_function(STATUS* status_vector, STATUS status, va_list args); - -void PARSE_STATUS(STATUS * status_vector, int &length, int &warning); -#endif - -#endif // FB_MISC_STATUS_H