From a887af3646de1f3ad88c622b9893ea360b1ac0ed Mon Sep 17 00:00:00 2001 From: skywalker Date: Fri, 4 Jan 2002 11:34:22 +0000 Subject: [PATCH] Changes to make it compile on linux. and work through a few issues. --- src/alice/alice.cpp | 6 +- src/burp/backup.epp | 32 +- src/burp/restore.epp | 58 +- src/common/memory/allocators.cpp | 4 +- src/common/memory/allocators.h | 9 +- src/dsql/pass1.cpp | 10 +- src/dsql/preparse.cpp | 26 +- src/gpre/ada.cpp | 4 +- src/gpre/c_cxx.cpp | 5 +- src/gpre/cmp.cpp | 3 +- src/gpre/exp.cpp | 6 +- src/gpre/ftn.cpp | 4 +- src/gpre/gpre.cpp | 21 +- src/gpre/gpre.h | 21 +- src/gpre/gpre_meta_boot.cpp | 6 +- src/gpre/par.cpp | 11 +- src/gpre/pat.cpp | 4 +- src/include/fb_exception.h | 8 +- src/include/gen/codes.h | 8 +- src/include/gen/codetext.h | 1386 ++++++++++++------------ src/include/gen/gds_codes.ftn | 2 +- src/include/gen/gds_codes.pas | 2 +- src/include/gen/iberror.h | 12 +- src/include/gen/msg_facs.h | 6 +- src/include/gen/msgs.h | 2 +- src/include/gen/rdb_codes.h | 2 +- src/include/gen/sql_code.h | 2 +- src/jrd/alt_use_sec.h | 2 +- src/jrd/builtin.cpp | 4 +- src/jrd/cmp.cpp | 5 +- src/jrd/codes.epp | 58 +- src/jrd/dfw.epp | 5 +- src/jrd/dpm.epp | 11 +- src/jrd/event.cpp | 6 +- src/jrd/functions.cpp | 4 +- src/jrd/gds.cpp | 7 +- src/jrd/ini.epp | 2 +- src/jrd/isc.cpp | 67 +- src/jrd/jrd.h | 3 +- src/jrd/met.epp | 9 +- src/jrd/opt.cpp | 5 +- src/jrd/par.cpp | 6 +- src/jrd/perf.cpp | 4 + src/jrd/sbm.cpp | 12 +- src/jrd/scl.epp | 2 +- src/jrd/svc.cpp | 40 +- src/jrd/tra.cpp | 2 +- src/jrd/vio.cpp | 3 +- src/lock/lock.cpp | 26 +- src/make.defaults | 4 +- src/make.new/Makefile.in.common.memory | 78 ++ src/make.new/Makefile.in.firebird | 7 +- src/make.new/Makefile.in.gpre | 4 +- src/make.new/Makefile.in.jrd | 13 +- src/make.new/config/config.h.in | 13 +- src/make.new/make.rules | 8 +- src/make.new/make.shared.variables | 17 +- src/make.new/prefix.linux | 9 +- src/make.platform | 292 ++--- src/make.rules | 20 +- src/make.shared.variables | 17 +- src/qli/eval.cpp | 3 + src/qli/exe.cpp | 3 + src/qli/mov.cpp | 3 + src/remote/allr.cpp | 30 +- src/remote/inet.cpp | 36 +- src/remote/remote.cpp | 6 +- src/utilities/drop.cpp | 16 +- src/utilities/dropv3.cpp | 9 +- src/v5_examples/empddl.sql | 2 + 70 files changed, 1305 insertions(+), 1228 deletions(-) create mode 100755 src/make.new/Makefile.in.common.memory diff --git a/src/alice/alice.cpp b/src/alice/alice.cpp index ee076d7f42..a3f11b83cb 100644 --- a/src/alice/alice.cpp +++ b/src/alice/alice.cpp @@ -24,7 +24,7 @@ // //____________________________________________________________ // -// $Id: alice.cpp,v 1.10 2001-12-29 11:41:21 tamlin Exp $ +// $Id: alice.cpp,v 1.11 2002-01-04 11:34:14 skywalker Exp $ // // 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE" // conditionals, as the engine now fully supports @@ -97,7 +97,7 @@ static bool fAnsiCP = false; #endif static void ALICE_error(USHORT number); // overloaded to keep down param count -static inline void translate_cp(LPSTR sz); +static inline void translate_cp(TEXT* sz); static void expand_filename(TEXT*, TEXT*); static int output_thread(SLONG, UCHAR*); static int output_main(SLONG, UCHAR*); @@ -815,7 +815,7 @@ static void alice_output(CONST SCHAR * format, ...) // 2. The macro GUI_TOOLS is NOT defined AND // 3. The static variable fAnsiCP is false. // -static inline void translate_cp(LPSTR sz) +static inline void translate_cp(TEXT* sz) { #if defined (WIN95) && !defined (GUI_TOOLS) if (!fAnsiCP) { diff --git a/src/burp/backup.epp b/src/burp/backup.epp index e4d6ceaa86..3e6fce6200 100644 --- a/src/burp/backup.epp +++ b/src/burp/backup.epp @@ -22,7 +22,7 @@ * Toni Martir: Added verbose backup records as BACKUP_VERBOSE_INTERVAL */ /* -$Id: backup.epp,v 1.3 2001-12-24 02:50:47 tamlin Exp $ +$Id: backup.epp,v 1.4 2002-01-04 11:34:14 skywalker Exp $ */ #include "firebird.h" @@ -145,23 +145,23 @@ typedef struct rfr_tab_t { } *RFR_TAB; static CONST struct rfr_tab_t rfr_table[] = { - "RDB$INDICES", "RDB$INDEX_INACTIVE", BCK_idx_inactive, + {"RDB$INDICES", "RDB$INDEX_INACTIVE", BCK_idx_inactive}, /* Backup of V2 triggers no longer supported 1996-Aug-05 David Schnepper - "RDB$RELATIONS", "RDB$STORE_TRIGGER", BCK_triggers, + {"RDB$RELATIONS", "RDB$STORE_TRIGGER", BCK_triggers}, */ - "RDB$RELATIONS", "RDB$EXTERNAL_FILE", BCK_external, - "RDB$SECURITY_CLASSES", "RDB$SECURITY_CLASS", BCK_security, - "RDB$FILES", "RDB$FILE_NAME", BCK_files, - "RDB$VIEW_RELATIONS", "RDB$CONTEXT_NAME", BCK_context_name, - "RDB$DATABASE", "RDB$DESCRIPTION", BCK_db_description, - "RDB$FUNCTIONS", "RDB$FUNCTION_NAME", BCK_ffmptt, - "RDB$FIELDS", "RDB$EXTERNAL_LENGTH", BCK_attributes_v3, - "RDB$RELATION_FIELDS", "RDB$SYSTEM_FLAG", BCK_rfr_sys_flag, - "RDB$FIELD_DIMENSIONS", "RDB$DIMENSION", BCK_ods6, - "RDB$PROCEDURES", "RDB$PROCEDURE_NAME", BCK_ods8, - "RDB$ROLES", "RDB$ROLE_NAME", BCK_ods9, - "RDB$FIELDS", "RDB$FIELD_PRECISION", BCK_ods10, - 0, 0, 0 + {"RDB$RELATIONS", "RDB$EXTERNAL_FILE", BCK_external}, + {"RDB$SECURITY_CLASSES", "RDB$SECURITY_CLASS", BCK_security}, + {"RDB$FILES", "RDB$FILE_NAME", BCK_files}, + {"RDB$VIEW_RELATIONS", "RDB$CONTEXT_NAME", BCK_context_name}, + {"RDB$DATABASE", "RDB$DESCRIPTION", BCK_db_description}, + {"RDB$FUNCTIONS", "RDB$FUNCTION_NAME", BCK_ffmptt}, + {"RDB$FIELDS", "RDB$EXTERNAL_LENGTH", BCK_attributes_v3}, + {"RDB$RELATION_FIELDS", "RDB$SYSTEM_FLAG", BCK_rfr_sys_flag}, + {"RDB$FIELD_DIMENSIONS", "RDB$DIMENSION", BCK_ods6}, + {"RDB$PROCEDURES", "RDB$PROCEDURE_NAME", BCK_ods8}, + {"RDB$ROLES", "RDB$ROLE_NAME", BCK_ods9}, + {"RDB$FIELDS", "RDB$FIELD_PRECISION", BCK_ods10}, + {0, 0, 0} }; static CONST SCHAR blob_items[] = diff --git a/src/burp/restore.epp b/src/burp/restore.epp index fef38b6f5e..f84c9af6da 100644 --- a/src/burp/restore.epp +++ b/src/burp/restore.epp @@ -24,7 +24,7 @@ * */ /* -$Id: restore.epp,v 1.3 2001-12-24 02:50:48 tamlin Exp $ +$Id: restore.epp,v 1.4 2002-01-04 11:34:14 skywalker Exp $ */ #include "firebird.h" @@ -93,34 +93,34 @@ static CONST struct s_t_cvtbl { /* NOTE: The magic numbers for collation_id come from ordinal * position of the COLLATION() entries in jrd/intlnames.h */ - 101, CS_DOS_437, 1, /* PDOX_ASCII */ - 102, CS_DOS_437, 2, /* PDOX_INTL */ - 106, CS_DOS_437, 3, /* PDOX_SWEDFIN */ - 160, CS_DOS_850, 0, /* codepoint collation */ - 107, CS_DOS_865, 0, /* codepoint collation */ - 105, CS_DOS_865, 1, /* PDOX_NORDAN4 */ - 139, CS_LATIN1, 1, /* DA_DA */ - 140, CS_LATIN1, 2, /* DU_NL */ - 141, CS_LATIN1, 3, /* FI_FI */ - 142, CS_LATIN1, 4, /* FR_FR */ - 143, CS_LATIN1, 5, /* FR_CA */ - 144, CS_LATIN1, 6, /* DE_DE */ - 145, CS_LATIN1, 7, /* IS_IS */ - 146, CS_LATIN1, 8, /* IT_IT */ - 148, CS_LATIN1, 9, /* NO_NO */ - 149, CS_LATIN1, 10, /* ES_ES */ - 151, CS_LATIN1, 11, /* SV_SV */ - 152, CS_LATIN1, 12, /* EN_UK */ - 153, CS_LATIN1, 14, /* EN_US */ - 154, CS_LATIN1, 15, /* PT_PT */ - 180, CS_NEXT, 1, /* NXT_US */ - 181, CS_NEXT, 2, /* NXT_GERMANY */ - 182, CS_NEXT, 3, /* NXT_FRANCE */ - 183, CS_NEXT, 4, /* NXT_ITALY */ - 184, CS_NEXT, 5, /* NXT_SPAIN */ - 201, CS_UNICODE_FSS, 0, /* codepoint collation */ - 220, CS_SJIS, 0, /* codepoint collation */ - 230, CS_EUCJ, 0 /* codepoint collation */ + {101, CS_DOS_437, 1}, /* PDOX_ASCII */ + {102, CS_DOS_437, 2}, /* PDOX_INTL */ + {106, CS_DOS_437, 3}, /* PDOX_SWEDFIN */ + {160, CS_DOS_850, 0}, /* codepoint collation */ + {107, CS_DOS_865, 0}, /* codepoint collation */ + {105, CS_DOS_865, 1}, /* PDOX_NORDAN4 */ + {139, CS_LATIN1, 1}, /* DA_DA */ + {140, CS_LATIN1, 2}, /* DU_NL */ + {141, CS_LATIN1, 3}, /* FI_FI */ + {142, CS_LATIN1, 4}, /* FR_FR */ + {143, CS_LATIN1, 5}, /* FR_CA */ + {144, CS_LATIN1, 6}, /* DE_DE */ + {145, CS_LATIN1, 7}, /* IS_IS */ + {146, CS_LATIN1, 8}, /* IT_IT */ + {148, CS_LATIN1, 9}, /* NO_NO */ + {149, CS_LATIN1, 10}, /* ES_ES */ + {151, CS_LATIN1, 11}, /* SV_SV */ + {152, CS_LATIN1, 12}, /* EN_UK */ + {153, CS_LATIN1, 14}, /* EN_US */ + {154, CS_LATIN1, 15}, /* PT_PT */ + {180, CS_NEXT, 1}, /* NXT_US */ + {181, CS_NEXT, 2}, /* NXT_GERMANY */ + {182, CS_NEXT, 3}, /* NXT_FRANCE */ + {183, CS_NEXT, 4}, /* NXT_ITALY */ + {184, CS_NEXT, 5}, /* NXT_SPAIN */ + {201, CS_UNICODE_FSS, 0}, /* codepoint collation */ + {220, CS_SJIS, 0}, /* codepoint collation */ + {230, CS_EUCJ, 0} /* codepoint collation */ }; static void add_files (UCHAR *); diff --git a/src/common/memory/allocators.cpp b/src/common/memory/allocators.cpp index 00a4f1fbb8..b3b795b5c7 100644 --- a/src/common/memory/allocators.cpp +++ b/src/common/memory/allocators.cpp @@ -124,7 +124,7 @@ void* operator new(size_t s) { printf("You MUST allocate all memory from a pool. Don't use the default global new().\n"); #if !defined(_MSC_VER) - throw std::bad_alloc(); + // throw std::bad_alloc(); #endif } #endif // DEV_BUILD @@ -145,7 +145,7 @@ void* operator new[](size_t s) if (++badNewCount > 1) { printf("You MUST allocate all memory from a pool. Don't use the default global new[]().\n"); - throw std::bad_alloc(); + // throw std::bad_alloc(); } #endif poolLoader.loadPool(); diff --git a/src/common/memory/allocators.h b/src/common/memory/allocators.h index 34b634d856..11f49c176c 100644 --- a/src/common/memory/allocators.h +++ b/src/common/memory/allocators.h @@ -115,16 +115,21 @@ namespace Firebird template struct rebind { typedef Firebird::allocator<_Tp1> other; }; - - bool operator==(const allocator& rhs) + + + bool operator==(const allocator& rhs) const { return pool == rhs.pool && type == rhs.type; } + + private: MemoryPool *pool; SSHORT type; }; + }; + #endif // COMMON_ALLOCATORS_H diff --git a/src/dsql/pass1.cpp b/src/dsql/pass1.cpp index 9f1339315b..923f6618d7 100644 --- a/src/dsql/pass1.cpp +++ b/src/dsql/pass1.cpp @@ -23,6 +23,7 @@ #include "firebird.h" #include +#include #include "../jrd/ib_stdio.h" #include "../jrd/gds.h" #include "../dsql/dsql.h" @@ -272,15 +273,18 @@ CTX PASS1_make_context( REQ request, NOD relation_node) if (count) { // Initialize this stack variable, and make it look like a node - nod desc_node; + std::auto_ptr desc_node(new(*tdsql->tsql_default, 0) nod); + for (input = context->ctx_proc_inputs->nod_arg, field = procedure->prc_inputs; field; input++, field = field->fld_next) { DEV_BLKCHK(field, dsql_type_fld); DEV_BLKCHK(*input, dsql_type_nod); - MAKE_desc_from_field(&desc_node.nod_desc, field); - set_parameter_type(*input, &desc_node, FALSE); + // MAKE_desc_from_field(&desc_node.nod_desc, field); + // set_parameter_type(*input, &desc_node, FALSE); + MAKE_desc_from_field(&(desc_node->nod_desc), field); + set_parameter_type(*input, desc_node.get(), FALSE); } } } diff --git a/src/dsql/preparse.cpp b/src/dsql/preparse.cpp index e640ab77c1..21e5f56f70 100644 --- a/src/dsql/preparse.cpp +++ b/src/dsql/preparse.cpp @@ -70,19 +70,19 @@ typedef struct pp_table { } PP_TABLE; static CONST PP_TABLE pp_symbols[] = { - "CREATE", 6, CREATE, - "DATABASE", 8, DATABASE, - "SCHEMA", 6, SCHEMA, - "PAGE_SIZE", 9, PAGE_SIZE, - "USER", 4, USER, - "PASSWORD", 8, PASSWORD, - "PAGESIZE", 8, PAGESIZE, - "LENGTH", 6, LENGTH, - "PAGES", 5, PAGES, - "PAGE", 4, PAGE, - "SET", 3, SET, - "NAMES", 5, NAMES, - "", 0, 0 + {"CREATE", 6, CREATE}, + {"DATABASE", 8, DATABASE}, + {"SCHEMA", 6, SCHEMA}, + {"PAGE_SIZE", 9, PAGE_SIZE}, + {"USER", 4, USER}, + {"PASSWORD", 8, PASSWORD}, + {"PAGESIZE", 8, PAGESIZE}, + {"LENGTH", 6, LENGTH}, + {"PAGES", 5, PAGES}, + {"PAGE", 4, PAGE}, + {"SET", 3, SET}, + {"NAMES", 5, NAMES}, + {"", 0, 0} }; /* define the tokens */ diff --git a/src/gpre/ada.cpp b/src/gpre/ada.cpp index 646f53e0a9..36f3626224 100644 --- a/src/gpre/ada.cpp +++ b/src/gpre/ada.cpp @@ -24,7 +24,7 @@ // //____________________________________________________________ // -// $Id: ada.cpp,v 1.4 2001-12-24 02:50:49 tamlin Exp $ +// $Id: ada.cpp,v 1.5 2002-01-04 11:34:14 skywalker Exp $ // #include "firebird.h" @@ -1044,7 +1044,7 @@ static void gen_compatibility_symbol( { TEXT *v3_prefix; - v3_prefix = (sw_language == lang_cxx) ? "gds_" : "gds__"; + v3_prefix = (isLangCpp(sw_language)) ? "gds_" : "gds__"; ib_fprintf(out_file, "#define %s%s\t%s%s%s\n", v3_prefix, symbol, v4_prefix, symbol, trailer); diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp index b274579fa4..674a999872 100644 --- a/src/gpre/c_cxx.cpp +++ b/src/gpre/c_cxx.cpp @@ -25,7 +25,7 @@ // //____________________________________________________________ // -// $Id: c_cxx.cpp,v 1.4 2001-12-24 02:50:49 tamlin Exp $ +// $Id: c_cxx.cpp,v 1.5 2002-01-04 11:34:15 skywalker Exp $ // #include "firebird.h" @@ -1333,7 +1333,8 @@ static void gen_compatibility_symbol( { const char *v3_prefix; - v3_prefix = (sw_language == lang_cxx) ? "gds_" : "gds__"; + v3_prefix = (isLangCpp(sw_language)) ? "gds_" : "gds__"; + // v3_prefix = (sw_language == lang_cxx) ? "gds_" : "gds__"; ib_fprintf(out_file, "#define %s%s\t%s%s%s\n", v3_prefix, symbol, v4_prefix, symbol, trailer); diff --git a/src/gpre/cmp.cpp b/src/gpre/cmp.cpp index 879e5ba3f6..7098e7599b 100644 --- a/src/gpre/cmp.cpp +++ b/src/gpre/cmp.cpp @@ -25,7 +25,7 @@ // //____________________________________________________________ // -// $Id: cmp.cpp,v 1.4 2001-12-24 02:50:49 tamlin Exp $ +// $Id: cmp.cpp,v 1.5 2002-01-04 11:34:15 skywalker Exp $ // #include "firebird.h" @@ -1552,6 +1552,7 @@ static void cmp_sdl_fudge( REQ request, SLONG lower_bound) case lang_c: case lang_cxx: case lang_basic: + case lang_internal: if (!lower_bound) break; STUFF(gds_sdl_add); diff --git a/src/gpre/exp.cpp b/src/gpre/exp.cpp index ea44362457..c82e7fbee2 100644 --- a/src/gpre/exp.cpp +++ b/src/gpre/exp.cpp @@ -25,7 +25,7 @@ // //____________________________________________________________ // -// $Id: exp.cpp,v 1.4 2001-12-24 02:50:49 tamlin Exp $ +// $Id: exp.cpp,v 1.5 2002-01-04 11:34:15 skywalker Exp $ // #include "firebird.h" @@ -1230,8 +1230,7 @@ static NOD par_and( REQ request) // in an RSE. // -static NOD par_array( - REQ request, +static NOD par_array(REQ request, FLD field, SSHORT subscript_flag, SSHORT sql_flag) { BOOLEAN paren = FALSE, bracket = FALSE; @@ -1282,6 +1281,7 @@ static NOD par_array( case lang_c: case lang_cxx: case lang_basic: + case lang_internal: index_node->nod_arg[0] = normalize_index(dimension, index_node->nod_arg[0], ZERO_BASED); diff --git a/src/gpre/ftn.cpp b/src/gpre/ftn.cpp index 23c1041550..3d37b671f5 100644 --- a/src/gpre/ftn.cpp +++ b/src/gpre/ftn.cpp @@ -24,7 +24,7 @@ // //____________________________________________________________ // -// $Id: ftn.cpp,v 1.4 2001-12-24 02:50:49 tamlin Exp $ +// $Id: ftn.cpp,v 1.5 2002-01-04 11:34:15 skywalker Exp $ // #include "firebird.h" @@ -5013,7 +5013,7 @@ static int gen_compatibility_symbol( { TEXT *v3_prefix; - v3_prefix = (sw_language == lang_cxx) ? "isc_" : "isc_"; + v3_prefix = (isLangCpp(sw_language)) ? "isc_" : "isc_"; ib_fprintf(out_file, "#define %s%s\t%s%s%s\n", v3_prefix, symbol, v4_prefix, symbol, trailer); diff --git a/src/gpre/gpre.cpp b/src/gpre/gpre.cpp index 918055721e..81486602cf 100644 --- a/src/gpre/gpre.cpp +++ b/src/gpre/gpre.cpp @@ -20,7 +20,7 @@ // // All Rights Reserved. // Contributor(s): ______________________________________. -// $Id: gpre.cpp,v 1.7 2001-12-29 11:41:22 tamlin Exp $ +// $Id: gpre.cpp,v 1.8 2002-01-04 11:34:15 skywalker Exp $ // Revision 1.2 2000/11/16 15:54:29 fsg // Added new switch -verbose to gpre that will dump // parsed lines to stderr @@ -38,7 +38,7 @@ // //____________________________________________________________ // -// $Id: gpre.cpp,v 1.7 2001-12-29 11:41:22 tamlin Exp $ +// $Id: gpre.cpp,v 1.8 2002-01-04 11:34:15 skywalker Exp $ // #define GPRE_MAIN @@ -168,7 +168,7 @@ static struct ext_table_t dml_ext_table[] = { lang_cxx, IN_SW_GPRE_CXX, ".exx", ".cxx" }, { lang_cpp, IN_SW_GPRE_CXX, ".epp", ".cpp" }, - { lang_internal, IN_SW_GPRE_G, ".e", ".c" }, + { lang_internal, IN_SW_GPRE_G, ".epp", ".cpp" }, { lang_pascal, IN_SW_GPRE_P, ".epas", ".pas" }, #ifdef FORTRAN @@ -669,13 +669,14 @@ int main(int argc, char* argv[]) sw_language = lang_internal; gen_routine = C_CXX_action; sw_cstring = TRUE; - transaction_name = "gds__trans"; + transaction_name = "gds_trans"; sw_know_interp = FALSE; sw_interp = 0; ident_pattern = "isc_%d"; utility_name = "isc_utility"; count_name = "isc_count"; slack_name = "isc_slack"; + database_name = "gds_database"; break; case IN_SW_GPRE_I: @@ -2183,7 +2184,7 @@ static TOK get_token() if (next == '\\' && !sw_sql && - ((sw_language == lang_c) || (sw_language == lang_cxx))) + ((sw_language == lang_c) || (isLangCpp(sw_language)))) { peek = nextchar(); if (peek == '\n') { @@ -2517,7 +2518,7 @@ static void pass2( SLONG start_position) const bool sw_block_comments = sw_language == lang_c || - sw_language == lang_cxx || + isLangCpp(sw_language) || sw_language == lang_pascal || sw_language == lang_pli; @@ -2699,7 +2700,7 @@ static void pass2( SLONG start_position) (*gen_routine) (action, start); if (action->act_type == ACT_routine && !action->act_object && - ((sw_language == lang_c) || (sw_language == lang_cxx))) continue; + ((sw_language == lang_c) || (isLangCpp(sw_language)))) continue; if (action->act_flags & ACT_break) return; @@ -2871,11 +2872,11 @@ static SSHORT skip_white() if (c == '/' && (sw_language == lang_c || - sw_language == lang_internal || - sw_language == lang_cxx || sw_language == lang_pli)) + isLangCpp(sw_language) || + sw_language == lang_pli)) { if ((next = nextchar()) != '*') { - if (sw_language == lang_cxx && next == '/') { + if (isLangCpp(sw_language) && next == '/') { while ((c = nextchar()) != '\n' && c != EOF); continue; } diff --git a/src/gpre/gpre.h b/src/gpre/gpre.h index c3bf09472a..761f72fac1 100644 --- a/src/gpre/gpre.h +++ b/src/gpre/gpre.h @@ -19,7 +19,7 @@ * * All Rights Reserved. * Contributor(s): ______________________________________. - * $Id: gpre.h,v 1.2 2001-12-24 02:50:49 tamlin Exp $ + * $Id: gpre.h,v 1.3 2002-01-04 11:34:15 skywalker Exp $ * Revision 1.3 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms * and allow edit.e and fred.e to go through @@ -193,6 +193,25 @@ typedef enum lang_t lang_cpp } LANG_T; +//___________________________________________________________________ +// Test if input language is cpp based. +// +// The lang_internal is used to compile some internal stuff without +// reference to a database. Previously it was based on lang_c (but even then +// if you look carefully there are some areas where lang_c is specifically +// treated and lang_internal would be ignored). +// Now the base language used for lang_internal is cpp, so we have this +// inline function to tell if language is cpp. +// Internally the sw_language variable is set to lang_cxx for the +// c++ source files, cxx, cpp, cplusplus, so we only need to test lang_cxx +// and lang_internal. +// +inline bool isLangCpp(LANG_T lang) { + if (lang == lang_cxx || lang == lang_internal) { + return true; + } + return false; +} typedef enum act_t { ACT_any, diff --git a/src/gpre/gpre_meta_boot.cpp b/src/gpre/gpre_meta_boot.cpp index 77eb783643..e9c16a976e 100644 --- a/src/gpre/gpre_meta_boot.cpp +++ b/src/gpre/gpre_meta_boot.cpp @@ -26,7 +26,7 @@ * *____________________________________________________________ * - * $Id: gpre_meta_boot.cpp,v 1.3 2001-12-24 02:50:49 tamlin Exp $ + * $Id: gpre_meta_boot.cpp,v 1.4 2002-01-04 11:34:15 skywalker Exp $ */ #include "firebird.h" @@ -206,7 +206,7 @@ BOOLEAN MET_get_domain_default(DBB dbb, TEXT * domain_name, TEXT * buffer, USHORT buff_length) { - SLONG *DB, *gds__trans; + SLONG *DB, *gds__rans; SCHAR name[NAME_SIZE]; SSHORT length; BOOLEAN has_default; @@ -985,4 +985,4 @@ BOOLEAN DLL_EXPORT ERR_post(STATUS status, ...) { } -} \ No newline at end of file +} diff --git a/src/gpre/par.cpp b/src/gpre/par.cpp index ad8e4f75fe..ee3f8293be 100644 --- a/src/gpre/par.cpp +++ b/src/gpre/par.cpp @@ -20,7 +20,7 @@ // // All Rights Reserved. // Contributor(s): ______________________________________. -// $Id: par.cpp,v 1.5 2001-12-29 11:41:22 tamlin Exp $ +// $Id: par.cpp,v 1.6 2002-01-04 11:34:15 skywalker Exp $ // Revision 1.2 2000/11/27 09:26:13 fsg // Fixed bugs in gpre to handle PYXIS forms // and allow edit.e and fred.e to go through @@ -37,7 +37,7 @@ // //____________________________________________________________ // -// $Id: par.cpp,v 1.5 2001-12-29 11:41:22 tamlin Exp $ +// $Id: par.cpp,v 1.6 2002-01-04 11:34:15 skywalker Exp $ // #include "firebird.h" @@ -673,7 +673,9 @@ BOOLEAN PAR_end() if ((sw_language == lang_ada) || (sw_language == lang_c) || - (sw_language == lang_cxx)) return MATCH(KW_SEMI_COLON); + (isLangCpp(sw_language))) { + return MATCH(KW_SEMI_COLON); + } return KEYWORD(KW_SEMI_COLON); } @@ -1675,8 +1677,9 @@ static ACT par_derived_from() ACT action; TEXT s[64]; - if ((sw_language != lang_c) && (sw_language != lang_cxx)) + if ((sw_language != lang_c) && (!isLangCpp(sw_language))) { return (NULL); + } action = MAKE_ACTION(0, ACT_basedon); based_on = (BAS) ALLOC(BAS_LEN); diff --git a/src/gpre/pat.cpp b/src/gpre/pat.cpp index b9eba28717..a49b9a79a2 100644 --- a/src/gpre/pat.cpp +++ b/src/gpre/pat.cpp @@ -24,7 +24,7 @@ // //____________________________________________________________ // -// $Id: pat.cpp,v 1.3 2001-12-24 02:50:49 tamlin Exp $ +// $Id: pat.cpp,v 1.4 2002-01-04 11:34:15 skywalker Exp $ // #include "firebird.h" @@ -134,7 +134,7 @@ void PATTERN_expand( USHORT column, TEXT * pattern, PAT * args) val = ""; valend = ""; - if ((sw_language == lang_c) || (sw_language == lang_cxx)) { + if ((sw_language == lang_c) || (isLangCpp(sw_language))) { ref = "&"; refend = ""; } diff --git a/src/include/fb_exception.h b/src/include/fb_exception.h index 5fbe3a9637..1108415d10 100644 --- a/src/include/fb_exception.h +++ b/src/include/fb_exception.h @@ -35,8 +35,8 @@ public: explicit status_exception(STATUS s) : m_s(s) {} - virtual ~status_exception() {} - virtual const char* what() const + virtual ~status_exception() throw() {} + virtual const char* what() const throw() { return "Firebird::status_exception"; } STATUS value() const { return m_s; } @@ -50,7 +50,7 @@ private: class red_zone_error : public std::exception { public: - virtual const char* what() const + virtual const char* what() const throw() { return "Firebird::red_zone_error"; } // TMN: to be moved into its own source file! @@ -60,7 +60,7 @@ public: class memory_corrupt : public std::exception { public: - virtual const char* what() const + virtual const char* what() const throw() { return "Firebird::memory_corrupt"; } // TMN: to be moved into its own source file! diff --git a/src/include/gen/codes.h b/src/include/gen/codes.h index 01c6ea1639..aeec188240 100644 --- a/src/include/gen/codes.h +++ b/src/include/gen/codes.h @@ -10,7 +10,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * @@ -18,8 +18,8 @@ * */ -#ifndef JRD_GEN_CODES_H -#define JRD_GEN_CODES_H +#ifndef _JRD_GEN_CODES_H +#define _JRD_GEN_CODES_H #ifdef __cplusplus /* c++ definitions */ @@ -1457,4 +1457,4 @@ const GDS_LONG gds_err_max = 692L; #include "gen/iberror.h" -#endif +#endif /* JRD_GEN_CODES_H */ diff --git a/src/include/gen/codetext.h b/src/include/gen/codetext.h index f1f359cb0e..64513c8046 100644 --- a/src/include/gen/codetext.h +++ b/src/include/gen/codetext.h @@ -10,702 +10,702 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * * *** WARNING *** - This file is automatically generated by codes.e - do not edit! * */ -"arith_except", 335544321, -"bad_dbkey", 335544322, -"bad_db_format", 335544323, -"bad_db_handle", 335544324, -"bad_dpb_content", 335544325, -"bad_dpb_form", 335544326, -"bad_req_handle", 335544327, -"bad_segstr_handle", 335544328, -"bad_segstr_id", 335544329, -"bad_tpb_content", 335544330, -"bad_tpb_form", 335544331, -"bad_trans_handle", 335544332, -"bug_check", 335544333, -"convert_error", 335544334, -"db_corrupt", 335544335, -"deadlock", 335544336, -"excess_trans", 335544337, -"from_no_match", 335544338, -"infinap", 335544339, -"infona", 335544340, -"infunk", 335544341, -"integ_fail", 335544342, -"invalid_blr", 335544343, -"io_error", 335544344, -"lock_conflict", 335544345, -"metadata_corrupt", 335544346, -"not_valid", 335544347, -"no_cur_rec", 335544348, -"no_dup", 335544349, -"no_finish", 335544350, -"no_meta_update", 335544351, -"no_priv", 335544352, -"no_recon", 335544353, -"no_record", 335544354, -"no_segstr_close", 335544355, -"obsolete_metadata", 335544356, -"open_trans", 335544357, -"port_len", 335544358, -"read_only_field", 335544359, -"read_only_rel", 335544360, -"read_only_trans", 335544361, -"read_only_view", 335544362, -"req_no_trans", 335544363, -"req_sync", 335544364, -"req_wrong_db", 335544365, -"segment", 335544366, -"segstr_eof", 335544367, -"segstr_no_op", 335544368, -"segstr_no_read", 335544369, -"segstr_no_trans", 335544370, -"segstr_no_write", 335544371, -"segstr_wrong_db", 335544372, -"sys_request", 335544373, -"stream_eof", 335544374, -"unavailable", 335544375, -"unres_rel", 335544376, -"uns_ext", 335544377, -"wish_list", 335544378, -"wrong_ods", 335544379, -"wronumarg", 335544380, -"imp_exc", 335544381, -"random", 335544382, -"fatal_conflict", 335544383, -"badblk", 335544384, -"invpoolcl", 335544385, -"nopoolids", 335544386, -"relbadblk", 335544387, -"blktoobig", 335544388, -"bufexh", 335544389, -"syntaxerr", 335544390, -"bufinuse", 335544391, -"bdbincon", 335544392, -"reqinuse", 335544393, -"badodsver", 335544394, -"relnotdef", 335544395, -"fldnotdef", 335544396, -"dirtypage", 335544397, -"waifortra", 335544398, -"doubleloc", 335544399, -"nodnotfnd", 335544400, -"dupnodfnd", 335544401, -"locnotmar", 335544402, -"badpagtyp", 335544403, -"corrupt", 335544404, -"badpage", 335544405, -"badindex", 335544406, -"dbbnotzer", 335544407, -"tranotzer", 335544408, -"trareqmis", 335544409, -"badhndcnt", 335544410, -"wrotpbver", 335544411, -"wroblrver", 335544412, -"wrodpbver", 335544413, -"blobnotsup", 335544414, -"badrelation", 335544415, -"nodetach", 335544416, -"notremote", 335544417, -"trainlim", 335544418, -"notinlim", 335544419, -"traoutsta", 335544420, -"connect_reject", 335544421, -"dbfile", 335544422, -"orphan", 335544423, -"no_lock_mgr", 335544424, -"ctxinuse", 335544425, -"ctxnotdef", 335544426, -"datnotsup", 335544427, -"badmsgnum", 335544428, -"badparnum", 335544429, -"virmemexh", 335544430, -"blocking_signal", 335544431, -"lockmanerr", 335544432, -"journerr", 335544433, -"keytoobig", 335544434, -"nullsegkey", 335544435, -"sqlerr", 335544436, -"wrodynver", 335544437, -"funnotdef", 335544438, -"funmismat", 335544439, -"bad_msg_vec", 335544440, -"bad_detach", 335544441, -"noargacc_read", 335544442, -"noargacc_write", 335544443, -"read_only", 335544444, -"ext_err", 335544445, -"non_updatable", 335544446, -"no_rollback", 335544447, -"bad_sec_info", 335544448, -"invalid_sec_info", 335544449, -"misc_interpreted", 335544450, -"update_conflict", 335544451, -"unlicensed", 335544452, -"obj_in_use", 335544453, -"nofilter", 335544454, -"shadow_accessed", 335544455, -"invalid_sdl", 335544456, -"out_of_bounds", 335544457, -"invalid_dimension", 335544458, -"rec_in_limbo", 335544459, -"shadow_missing", 335544460, -"cant_validate", 335544461, -"cant_start_journal", 335544462, -"gennotdef", 335544463, -"cant_start_logging", 335544464, -"bad_segstr_type", 335544465, -"foreign_key", 335544466, -"high_minor", 335544467, -"tra_state", 335544468, -"trans_invalid", 335544469, -"buf_invalid", 335544470, -"indexnotdefined", 335544471, -"login", 335544472, -"invalid_bookmark", 335544473, -"bad_lock_level", 335544474, -"relation_lock", 335544475, -"record_lock", 335544476, -"max_idx", 335544477, -"jrn_enable", 335544478, -"old_failure", 335544479, -"old_in_progress", 335544480, -"old_no_space", 335544481, -"no_wal_no_jrn", 335544482, -"num_old_files", 335544483, -"wal_file_open", 335544484, -"bad_stmt_handle", 335544485, -"wal_failure", 335544486, -"walw_err", 335544487, -"logh_small", 335544488, -"logh_inv_version", 335544489, -"logh_open_flag", 335544490, -"logh_open_flag2", 335544491, -"logh_diff_dbname", 335544492, -"logf_unexpected_eof", 335544493, -"logr_incomplete", 335544494, -"logr_header_small", 335544495, -"logb_small", 335544496, -"wal_illegal_attach", 335544497, -"wal_invalid_wpb", 335544498, -"wal_err_rollover", 335544499, -"no_wal", 335544500, -"drop_wal", 335544501, -"stream_not_defined", 335544502, -"wal_subsys_error", 335544503, -"wal_subsys_corrupt", 335544504, -"no_archive", 335544505, -"shutinprog", 335544506, -"range_in_use", 335544507, -"range_not_found", 335544508, -"charset_not_found", 335544509, -"lock_timeout", 335544510, -"prcnotdef", 335544511, -"prcmismat", 335544512, -"wal_bugcheck", 335544513, -"wal_cant_expand", 335544514, -"codnotdef", 335544515, -"xcpnotdef", 335544516, -"except", 335544517, -"cache_restart", 335544518, -"bad_lock_handle", 335544519, -"jrn_present", 335544520, -"wal_err_rollover2", 335544521, -"wal_err_logwrite", 335544522, -"wal_err_jrn_comm", 335544523, -"wal_err_expansion", 335544524, -"wal_err_setup", 335544525, -"wal_err_ww_sync", 335544526, -"wal_err_ww_start", 335544527, -"shutdown", 335544528, -"existing_priv_mod", 335544529, -"primary_key_ref", 335544530, -"primary_key_notnull", 335544531, -"ref_cnstrnt_notfound", 335544532, -"foreign_key_notfound", 335544533, -"ref_cnstrnt_update", 335544534, -"check_cnstrnt_update", 335544535, -"check_cnstrnt_del", 335544536, -"integ_index_seg_del", 335544537, -"integ_index_seg_mod", 335544538, -"integ_index_del", 335544539, -"integ_index_mod", 335544540, -"check_trig_del", 335544541, -"check_trig_update", 335544542, -"cnstrnt_fld_del", 335544543, -"cnstrnt_fld_rename", 335544544, -"rel_cnstrnt_update", 335544545, -"constaint_on_view", 335544546, -"invld_cnstrnt_type", 335544547, -"primary_key_exists", 335544548, -"systrig_update", 335544549, -"not_rel_owner", 335544550, -"grant_obj_notfound", 335544551, -"grant_fld_notfound", 335544552, -"grant_nopriv", 335544553, -"nonsql_security_rel", 335544554, -"nonsql_security_fld", 335544555, -"wal_cache_err", 335544556, -"shutfail", 335544557, -"check_constraint", 335544558, -"bad_svc_handle", 335544559, -"shutwarn", 335544560, -"wrospbver", 335544561, -"bad_spb_form", 335544562, -"svcnotdef", 335544563, -"no_jrn", 335544564, -"transliteration_failed", 335544565, -"start_cm_for_wal", 335544566, -"wal_ovflow_log_required", 335544567, -"text_subtype", 335544568, -"dsql_error", 335544569, -"dsql_command_err", 335544570, -"dsql_constant_err", 335544571, -"dsql_cursor_err", 335544572, -"dsql_datatype_err", 335544573, -"dsql_decl_err", 335544574, -"dsql_cursor_update_err", 335544575, -"dsql_cursor_open_err", 335544576, -"dsql_cursor_close_err", 335544577, -"dsql_field_err", 335544578, -"dsql_internal_err", 335544579, -"dsql_relation_err", 335544580, -"dsql_procedure_err", 335544581, -"dsql_request_err", 335544582, -"dsql_sqlda_err", 335544583, -"dsql_var_count_err", 335544584, -"dsql_stmt_handle", 335544585, -"dsql_function_err", 335544586, -"dsql_blob_err", 335544587, -"collation_not_found", 335544588, -"collation_not_for_charset", 335544589, -"dsql_dup_option", 335544590, -"dsql_tran_err", 335544591, -"dsql_invalid_array", 335544592, -"dsql_max_arr_dim_exceeded", 335544593, -"dsql_arr_range_error", 335544594, -"dsql_trigger_err", 335544595, -"dsql_subselect_err", 335544596, -"dsql_crdb_prepare_err", 335544597, -"specify_field_err", 335544598, -"num_field_err", 335544599, -"col_name_err", 335544600, -"where_err", 335544601, -"table_view_err", 335544602, -"distinct_err", 335544603, -"key_field_count_err", 335544604, -"subquery_err", 335544605, -"expression_eval_err", 335544606, -"node_err", 335544607, -"command_end_err", 335544608, -"index_name", 335544609, -"exception_name", 335544610, -"field_name", 335544611, -"token_err", 335544612, -"union_err", 335544613, -"dsql_construct_err", 335544614, -"field_aggregate_err", 335544615, -"field_ref_err", 335544616, -"order_by_err", 335544617, -"return_mode_err", 335544618, -"extern_func_err", 335544619, -"alias_conflict_err", 335544620, -"procedure_conflict_error", 335544621, -"relation_conflict_err", 335544622, -"dsql_domain_err", 335544623, -"idx_seg_err", 335544624, -"node_name_err", 335544625, -"table_name", 335544626, -"proc_name", 335544627, -"idx_create_err", 335544628, -"wal_shadow_err", 335544629, -"dependency", 335544630, -"idx_key_err", 335544631, -"dsql_file_length_err", 335544632, -"dsql_shadow_number_err", 335544633, -"dsql_token_unk_err", 335544634, -"dsql_no_relation_alias", 335544635, -"indexname", 335544636, -"no_stream_plan", 335544637, -"stream_twice", 335544638, -"stream_not_found", 335544639, -"collation_requires_text", 335544640, -"dsql_domain_not_found", 335544641, -"index_unused", 335544642, -"dsql_self_join", 335544643, -"stream_bof", 335544644, -"stream_crack", 335544645, -"db_or_file_exists", 335544646, -"invalid_operator", 335544647, -"conn_lost", 335544648, -"bad_checksum", 335544649, -"page_type_err", 335544650, -"ext_readonly_err", 335544651, -"sing_select_err", 335544652, -"psw_attach", 335544653, -"psw_start_trans", 335544654, -"invalid_direction", 335544655, -"dsql_var_conflict", 335544656, -"dsql_no_blob_array", 335544657, -"dsql_base_table", 335544658, -"duplicate_base_table", 335544659, -"view_alias", 335544660, -"index_root_page_full", 335544661, -"dsql_blob_type_unknown", 335544662, -"req_max_clones_exceeded", 335544663, -"dsql_duplicate_spec", 335544664, -"unique_key_violation", 335544665, -"srvr_version_too_old", 335544666, -"drdb_completed_with_errs", 335544667, -"dsql_procedure_use_err", 335544668, -"dsql_count_mismatch", 335544669, -"blob_idx_err", 335544670, -"array_idx_err", 335544671, -"key_field_err", 335544672, -"no_delete", 335544673, -"del_last_field", 335544674, -"sort_err", 335544675, -"sort_mem_err", 335544676, -"version_err", 335544677, -"inval_key_posn", 335544678, -"no_segments_err", 335544679, -"crrp_data_err", 335544680, -"rec_size_err", 335544681, -"dsql_field_ref", 335544682, -"req_depth_exceeded", 335544683, -"no_field_access", 335544684, -"no_dbkey", 335544685, -"jrn_format_err", 335544686, -"jrn_file_full", 335544687, -"dsql_open_cursor_request", 335544688, -"ib_error", 335544689, -"cache_redef", 335544690, -"cache_too_small", 335544691, -"log_redef", 335544692, -"log_too_small", 335544693, -"partition_too_small", 335544694, -"partition_not_supp", 335544695, -"log_length_spec", 335544696, -"precision_err", 335544697, -"scale_nogt", 335544698, -"expec_short", 335544699, -"expec_long", 335544700, -"expec_ushort", 335544701, -"like_escape_invalid", 335544702, -"svcnoexe", 335544703, -"net_lookup_err", 335544704, -"service_unknown", 335544705, -"host_unknown", 335544706, -"grant_nopriv_on_base", 335544707, -"dyn_fld_ambiguous", 335544708, -"dsql_agg_ref_err", 335544709, -"complex_view", 335544710, -"unprepared_stmt", 335544711, -"expec_positive", 335544712, -"dsql_sqlda_value_err", 335544713, -"invalid_array_id", 335544714, -"extfile_uns_op", 335544715, -"svc_in_use", 335544716, -"err_stack_limit", 335544717, -"invalid_key", 335544718, -"net_init_error", 335544719, -"loadlib_failure", 335544720, -"network_error", 335544721, -"net_connect_err", 335544722, -"net_connect_listen_err", 335544723, -"net_event_connect_err", 335544724, -"net_event_listen_err", 335544725, -"net_read_err", 335544726, -"net_write_err", 335544727, -"integ_index_deactivate", 335544728, -"integ_deactivate_primary", 335544729, -"cse_not_supported", 335544730, -"tra_must_sweep", 335544731, -"unsupported_network_drive", 335544732, -"io_create_err", 335544733, -"io_open_err", 335544734, -"io_close_err", 335544735, -"io_read_err", 335544736, -"io_write_err", 335544737, -"io_delete_err", 335544738, -"io_access_err", 335544739, -"udf_exception", 335544740, -"lost_db_connection", 335544741, -"no_write_user_priv", 335544742, -"token_too_long", 335544743, -"max_att_exceeded", 335544744, -"login_same_as_role_name", 335544745, -"reftable_requires_pk", 335544746, -"usrname_too_long", 335544747, -"password_too_long", 335544748, -"usrname_required", 335544749, -"password_required", 335544750, -"bad_protocol", 335544751, -"dup_usrname_found", 335544752, -"usrname_not_found", 335544753, -"error_adding_sec_record", 335544754, -"error_modifying_sec_record", 335544755, -"error_deleting_sec_record", 335544756, -"error_updating_sec_db", 335544757, -"sort_rec_size_err", 335544758, -"bad_default_value", 335544759, -"invalid_clause", 335544760, -"too_many_handles", 335544761, -"optimizer_blk_exc", 335544762, -"invalid_string_constant", 335544763, -"transitional_date", 335544764, -"read_only_database", 335544765, -"must_be_dialect_2_and_up", 335544766, -"blob_filter_exception", 335544767, -"exception_access_violation", 335544768, -"exception_datatype_missalignmen", 335544769, -"exception_array_bounds_exceeded", 335544770, -"exception_float_denormal_operan", 335544771, -"exception_float_divide_by_zero", 335544772, -"exception_float_inexact_result", 335544773, -"exception_float_invalid_operand", 335544774, -"exception_float_overflow", 335544775, -"exception_float_stack_check", 335544776, -"exception_float_underflow", 335544777, -"exception_integer_divide_by_zer", 335544778, -"exception_integer_overflow", 335544779, -"exception_unknown", 335544780, -"exception_stack_overflow", 335544781, -"exception_sigsegv", 335544782, -"exception_sigill", 335544783, -"exception_sigbus", 335544784, -"exception_sigfpe", 335544785, -"ext_file_delete", 335544786, -"ext_file_modify", 335544787, -"adm_task_denied", 335544788, -"extract_input_mismatch", 335544789, -"insufficient_svc_privileges", 335544790, -"file_in_use", 335544791, -"service_att_err", 335544792, -"ddl_not_allowed_by_db_sql_dial", 335544793, -"cancelled", 335544794, -"unexp_spb_form", 335544795, -"sql_dialect_datatype_unsupport", 335544796, -"svcnouser", 335544797, -"depend_on_uncommitted_rel", 335544798, -"svc_name_missing", 335544799, -"too_many_contexts", 335544800, -"datype_notsup", 335544801, -"dialect_reset_warning", 335544802, -"dialect_not_changed", 335544803, -"database_create_failed", 335544804, -"inv_dialect_specified", 335544805, -"valid_db_dialects", 335544806, -"sqlwarn", 335544807, -"dtype_renamed", 335544808, -"extern_func_dir_error", 335544809, -"date_range_exceeded", 335544810, -"inv_client_dialect_specified", 335544811, -"valid_client_dialects", 335544812, -"optimizer_between_err", 335544813, -"service_not_supported", 335544814, -"generator_name", 335544815, -"udf_name", 335544816, -"gfix_db_name", 335740929, -"gfix_invalid_sw", 335740930, -"gfix_incmp_sw", 335740932, -"gfix_replay_req", 335740933, -"gfix_pgbuf_req", 335740934, -"gfix_val_req", 335740935, -"gfix_pval_req", 335740936, -"gfix_trn_req", 335740937, -"gfix_full_req", 335740940, -"gfix_usrname_req", 335740941, -"gfix_pass_req", 335740942, -"gfix_subs_name", 335740943, -"gfix_wal_req", 335740944, -"gfix_sec_req", 335740945, -"gfix_nval_req", 335740946, -"gfix_type_shut", 335740947, -"gfix_retry", 335740948, -"gfix_retry_db", 335740951, -"gfix_exceed_max", 335740991, -"gfix_corrupt_pool", 335740992, -"gfix_mem_exhausted", 335740993, -"gfix_bad_pool", 335740994, -"gfix_trn_not_valid", 335740995, -"gfix_unexp_eoi", 335741012, -"gfix_recon_fail", 335741018, -"gfix_trn_unknown", 335741036, -"gfix_mode_req", 335741038, -"gfix_opt_SQL_dialect", 335741039, -"dsql_dbkey_from_non_table", 336003074, -"dsql_transitional_numeric", 336003075, -"dsql_dialect_warning_expr", 336003076, -"sql_db_dialect_dtype_unsupport", 336003077, -"isc_sql_dialect_conflict_num", 336003079, -"dsql_warning_number_ambiguous", 336003080, -"dsql_warning_number_ambiguous1", 336003081, -"dsql_warn_precision_ambiguous", 336003082, -"dsql_warn_precision_ambiguous1", 336003083, -"dsql_warn_precision_ambiguous2", 336003084, -"dyn_role_does_not_exist", 336068796, -"dyn_no_grant_admin_opt", 336068797, -"dyn_user_not_role_member", 336068798, -"dyn_delete_role_failed", 336068799, -"dyn_grant_role_to_user", 336068800, -"dyn_inv_sql_role_name", 336068801, -"dyn_dup_sql_role", 336068802, -"dyn_kywd_spec_for_role", 336068803, -"dyn_roles_not_supported", 336068804, -"dyn_domain_name_exists", 336068812, -"dyn_field_name_exists", 336068813, -"dyn_dependency_exists", 336068814, -"dyn_dtype_invalid", 336068815, -"dyn_char_fld_too_small", 336068816, -"dyn_invalid_dtype_conversion", 336068817, -"dyn_dtype_conv_invalid", 336068818, -"dyn_zero_len_id", 336068820, -"gbak_unknown_switch", 336330753, -"gbak_page_size_missing", 336330754, -"gbak_page_size_toobig", 336330755, -"gbak_redir_ouput_missing", 336330756, -"gbak_switches_conflict", 336330757, -"gbak_unknown_device", 336330758, -"gbak_no_protection", 336330759, -"gbak_page_size_not_allowed", 336330760, -"gbak_multi_source_dest", 336330761, -"gbak_filename_missing", 336330762, -"gbak_dup_inout_names", 336330763, -"gbak_inv_page_size", 336330764, -"gbak_db_specified", 336330765, -"gbak_db_exists", 336330766, -"gbak_unk_device", 336330767, -"gbak_blob_info_failed", 336330772, -"gbak_unk_blob_item", 336330773, -"gbak_get_seg_failed", 336330774, -"gbak_close_blob_failed", 336330775, -"gbak_open_blob_failed", 336330776, -"gbak_put_blr_gen_id_failed", 336330777, -"gbak_unk_type", 336330778, -"gbak_comp_req_failed", 336330779, -"gbak_start_req_failed", 336330780, -"gbak_rec_failed", 336330781, -"gbak_rel_req_failed", 336330782, -"gbak_db_info_failed", 336330783, -"gbak_no_db_desc", 336330784, -"gbak_db_create_failed", 336330785, -"gbak_decomp_len_error", 336330786, -"gbak_tbl_missing", 336330787, -"gbak_blob_col_missing", 336330788, -"gbak_create_blob_failed", 336330789, -"gbak_put_seg_failed", 336330790, -"gbak_rec_len_exp", 336330791, -"gbak_inv_rec_len", 336330792, -"gbak_exp_data_type", 336330793, -"gbak_gen_id_failed", 336330794, -"gbak_unk_rec_type", 336330795, -"gbak_inv_bkup_ver", 336330796, -"gbak_missing_bkup_desc", 336330797, -"gbak_string_trunc", 336330798, -"gbak_cant_rest_record", 336330799, -"gbak_send_failed", 336330800, -"gbak_no_tbl_name", 336330801, -"gbak_unexp_eof", 336330802, -"gbak_db_format_too_old", 336330803, -"gbak_inv_array_dim", 336330804, -"gbak_xdr_len_expected", 336330807, -"gbak_open_bkup_error", 336330817, -"gbak_open_error", 336330818, -"gbak_missing_block_fac", 336330934, -"gbak_inv_block_fac", 336330935, -"gbak_block_fac_specified", 336330936, -"gbak_missing_username", 336330940, -"gbak_missing_password", 336330941, -"gbak_missing_skipped_bytes", 336330952, -"gbak_inv_skipped_bytes", 336330953, -"gbak_err_restore_charset", 336330965, -"gbak_err_restore_collation", 336330967, -"gbak_read_error", 336330972, -"gbak_write_error", 336330973, -"gbak_db_in_use", 336330985, -"gbak_sysmemex", 336330990, -"gbak_restore_role_failed", 336331002, -"gbak_role_op_missing", 336331005, -"gbak_page_buffers_missing", 336331010, -"gbak_page_buffers_wrong_param", 336331011, -"gbak_page_buffers_restore", 336331012, -"gbak_inv_size", 336331014, -"gbak_file_outof_sequence", 336331015, -"gbak_join_file_missing", 336331016, -"gbak_stdin_not_supptd", 336331017, -"gbak_stdout_not_supptd", 336331018, -"gbak_bkup_corrupt", 336331019, -"gbak_unk_db_file_spec", 336331020, -"gbak_hdr_write_failed", 336331021, -"gbak_disk_space_ex", 336331022, -"gbak_size_lt_min", 336331023, -"gbak_svc_name_missing", 336331025, -"gbak_not_ownr", 336331026, -"gbak_mode_req", 336331031, -"gsec_cant_open_db", 336723983, -"gsec_switches_error", 336723984, -"gsec_no_op_spec", 336723985, -"gsec_no_usr_name", 336723986, -"gsec_err_add", 336723987, -"gsec_err_modify", 336723988, -"gsec_err_find_mod", 336723989, -"gsec_err_rec_not_found", 336723990, -"gsec_err_delete", 336723991, -"gsec_err_find_del", 336723992, -"gsec_err_find_disp", 336723996, -"gsec_inv_param", 336723997, -"gsec_op_specified", 336723998, -"gsec_pw_specified", 336723999, -"gsec_uid_specified", 336724000, -"gsec_gid_specified", 336724001, -"gsec_proj_specified", 336724002, -"gsec_org_specified", 336724003, -"gsec_fname_specified", 336724004, -"gsec_mname_specified", 336724005, -"gsec_lname_specified", 336724006, -"gsec_inv_switch", 336724008, -"gsec_amb_switch", 336724009, -"gsec_no_op_specified", 336724010, -"gsec_params_not_allowed", 336724011, -"gsec_incompat_switch", 336724012, -"gsec_inv_username", 336724044, -"gsec_inv_pw_length", 336724045, -"gsec_db_specified", 336724046, -"gsec_db_admin_specified", 336724047, -"gsec_db_admin_pw_specified", 336724048, -"gsec_sql_role_specified", 336724049, -"license_no_file", 336789504, -"license_op_specified", 336789523, -"license_op_missing", 336789524, -"license_inv_switch", 336789525, -"license_inv_switch_combo", 336789526, -"license_inv_op_combo", 336789527, -"license_amb_switch", 336789528, -"license_inv_parameter", 336789529, -"license_param_specified", 336789530, -"license_param_req", 336789531, -"license_syntx_error", 336789532, -"license_dup_id", 336789534, -"license_inv_id_key", 336789535, -"license_err_remove", 336789536, -"license_err_update", 336789537, -"license_err_convert", 336789538, -"license_err_unk", 336789539, -"license_svc_err_add", 336789540, -"license_svc_err_remove", 336789541, -"license_eval_exists", 336789563, -"gstat_unknown_switch", 336920577, -"gstat_retry", 336920578, -"gstat_wrong_ods", 336920579, -"gstat_unexpected_eof", 336920580, -"gstat_open_err", 336920605, -"gstat_read_err", 336920606, -"gstat_sysmemex", 336920607, +{"arith_except", 335544321}, +{"bad_dbkey", 335544322}, +{"bad_db_format", 335544323}, +{"bad_db_handle", 335544324}, +{"bad_dpb_content", 335544325}, +{"bad_dpb_form", 335544326}, +{"bad_req_handle", 335544327}, +{"bad_segstr_handle", 335544328}, +{"bad_segstr_id", 335544329}, +{"bad_tpb_content", 335544330}, +{"bad_tpb_form", 335544331}, +{"bad_trans_handle", 335544332}, +{"bug_check", 335544333}, +{"convert_error", 335544334}, +{"db_corrupt", 335544335}, +{"deadlock", 335544336}, +{"excess_trans", 335544337}, +{"from_no_match", 335544338}, +{"infinap", 335544339}, +{"infona", 335544340}, +{"infunk", 335544341}, +{"integ_fail", 335544342}, +{"invalid_blr", 335544343}, +{"io_error", 335544344}, +{"lock_conflict", 335544345}, +{"metadata_corrupt", 335544346}, +{"not_valid", 335544347}, +{"no_cur_rec", 335544348}, +{"no_dup", 335544349}, +{"no_finish", 335544350}, +{"no_meta_update", 335544351}, +{"no_priv", 335544352}, +{"no_recon", 335544353}, +{"no_record", 335544354}, +{"no_segstr_close", 335544355}, +{"obsolete_metadata", 335544356}, +{"open_trans", 335544357}, +{"port_len", 335544358}, +{"read_only_field", 335544359}, +{"read_only_rel", 335544360}, +{"read_only_trans", 335544361}, +{"read_only_view", 335544362}, +{"req_no_trans", 335544363}, +{"req_sync", 335544364}, +{"req_wrong_db", 335544365}, +{"segment", 335544366}, +{"segstr_eof", 335544367}, +{"segstr_no_op", 335544368}, +{"segstr_no_read", 335544369}, +{"segstr_no_trans", 335544370}, +{"segstr_no_write", 335544371}, +{"segstr_wrong_db", 335544372}, +{"sys_request", 335544373}, +{"stream_eof", 335544374}, +{"unavailable", 335544375}, +{"unres_rel", 335544376}, +{"uns_ext", 335544377}, +{"wish_list", 335544378}, +{"wrong_ods", 335544379}, +{"wronumarg", 335544380}, +{"imp_exc", 335544381}, +{"random", 335544382}, +{"fatal_conflict", 335544383}, +{"badblk", 335544384}, +{"invpoolcl", 335544385}, +{"nopoolids", 335544386}, +{"relbadblk", 335544387}, +{"blktoobig", 335544388}, +{"bufexh", 335544389}, +{"syntaxerr", 335544390}, +{"bufinuse", 335544391}, +{"bdbincon", 335544392}, +{"reqinuse", 335544393}, +{"badodsver", 335544394}, +{"relnotdef", 335544395}, +{"fldnotdef", 335544396}, +{"dirtypage", 335544397}, +{"waifortra", 335544398}, +{"doubleloc", 335544399}, +{"nodnotfnd", 335544400}, +{"dupnodfnd", 335544401}, +{"locnotmar", 335544402}, +{"badpagtyp", 335544403}, +{"corrupt", 335544404}, +{"badpage", 335544405}, +{"badindex", 335544406}, +{"dbbnotzer", 335544407}, +{"tranotzer", 335544408}, +{"trareqmis", 335544409}, +{"badhndcnt", 335544410}, +{"wrotpbver", 335544411}, +{"wroblrver", 335544412}, +{"wrodpbver", 335544413}, +{"blobnotsup", 335544414}, +{"badrelation", 335544415}, +{"nodetach", 335544416}, +{"notremote", 335544417}, +{"trainlim", 335544418}, +{"notinlim", 335544419}, +{"traoutsta", 335544420}, +{"connect_reject", 335544421}, +{"dbfile", 335544422}, +{"orphan", 335544423}, +{"no_lock_mgr", 335544424}, +{"ctxinuse", 335544425}, +{"ctxnotdef", 335544426}, +{"datnotsup", 335544427}, +{"badmsgnum", 335544428}, +{"badparnum", 335544429}, +{"virmemexh", 335544430}, +{"blocking_signal", 335544431}, +{"lockmanerr", 335544432}, +{"journerr", 335544433}, +{"keytoobig", 335544434}, +{"nullsegkey", 335544435}, +{"sqlerr", 335544436}, +{"wrodynver", 335544437}, +{"funnotdef", 335544438}, +{"funmismat", 335544439}, +{"bad_msg_vec", 335544440}, +{"bad_detach", 335544441}, +{"noargacc_read", 335544442}, +{"noargacc_write", 335544443}, +{"read_only", 335544444}, +{"ext_err", 335544445}, +{"non_updatable", 335544446}, +{"no_rollback", 335544447}, +{"bad_sec_info", 335544448}, +{"invalid_sec_info", 335544449}, +{"misc_interpreted", 335544450}, +{"update_conflict", 335544451}, +{"unlicensed", 335544452}, +{"obj_in_use", 335544453}, +{"nofilter", 335544454}, +{"shadow_accessed", 335544455}, +{"invalid_sdl", 335544456}, +{"out_of_bounds", 335544457}, +{"invalid_dimension", 335544458}, +{"rec_in_limbo", 335544459}, +{"shadow_missing", 335544460}, +{"cant_validate", 335544461}, +{"cant_start_journal", 335544462}, +{"gennotdef", 335544463}, +{"cant_start_logging", 335544464}, +{"bad_segstr_type", 335544465}, +{"foreign_key", 335544466}, +{"high_minor", 335544467}, +{"tra_state", 335544468}, +{"trans_invalid", 335544469}, +{"buf_invalid", 335544470}, +{"indexnotdefined", 335544471}, +{"login", 335544472}, +{"invalid_bookmark", 335544473}, +{"bad_lock_level", 335544474}, +{"relation_lock", 335544475}, +{"record_lock", 335544476}, +{"max_idx", 335544477}, +{"jrn_enable", 335544478}, +{"old_failure", 335544479}, +{"old_in_progress", 335544480}, +{"old_no_space", 335544481}, +{"no_wal_no_jrn", 335544482}, +{"num_old_files", 335544483}, +{"wal_file_open", 335544484}, +{"bad_stmt_handle", 335544485}, +{"wal_failure", 335544486}, +{"walw_err", 335544487}, +{"logh_small", 335544488}, +{"logh_inv_version", 335544489}, +{"logh_open_flag", 335544490}, +{"logh_open_flag2", 335544491}, +{"logh_diff_dbname", 335544492}, +{"logf_unexpected_eof", 335544493}, +{"logr_incomplete", 335544494}, +{"logr_header_small", 335544495}, +{"logb_small", 335544496}, +{"wal_illegal_attach", 335544497}, +{"wal_invalid_wpb", 335544498}, +{"wal_err_rollover", 335544499}, +{"no_wal", 335544500}, +{"drop_wal", 335544501}, +{"stream_not_defined", 335544502}, +{"wal_subsys_error", 335544503}, +{"wal_subsys_corrupt", 335544504}, +{"no_archive", 335544505}, +{"shutinprog", 335544506}, +{"range_in_use", 335544507}, +{"range_not_found", 335544508}, +{"charset_not_found", 335544509}, +{"lock_timeout", 335544510}, +{"prcnotdef", 335544511}, +{"prcmismat", 335544512}, +{"wal_bugcheck", 335544513}, +{"wal_cant_expand", 335544514}, +{"codnotdef", 335544515}, +{"xcpnotdef", 335544516}, +{"except", 335544517}, +{"cache_restart", 335544518}, +{"bad_lock_handle", 335544519}, +{"jrn_present", 335544520}, +{"wal_err_rollover2", 335544521}, +{"wal_err_logwrite", 335544522}, +{"wal_err_jrn_comm", 335544523}, +{"wal_err_expansion", 335544524}, +{"wal_err_setup", 335544525}, +{"wal_err_ww_sync", 335544526}, +{"wal_err_ww_start", 335544527}, +{"shutdown", 335544528}, +{"existing_priv_mod", 335544529}, +{"primary_key_ref", 335544530}, +{"primary_key_notnull", 335544531}, +{"ref_cnstrnt_notfound", 335544532}, +{"foreign_key_notfound", 335544533}, +{"ref_cnstrnt_update", 335544534}, +{"check_cnstrnt_update", 335544535}, +{"check_cnstrnt_del", 335544536}, +{"integ_index_seg_del", 335544537}, +{"integ_index_seg_mod", 335544538}, +{"integ_index_del", 335544539}, +{"integ_index_mod", 335544540}, +{"check_trig_del", 335544541}, +{"check_trig_update", 335544542}, +{"cnstrnt_fld_del", 335544543}, +{"cnstrnt_fld_rename", 335544544}, +{"rel_cnstrnt_update", 335544545}, +{"constaint_on_view", 335544546}, +{"invld_cnstrnt_type", 335544547}, +{"primary_key_exists", 335544548}, +{"systrig_update", 335544549}, +{"not_rel_owner", 335544550}, +{"grant_obj_notfound", 335544551}, +{"grant_fld_notfound", 335544552}, +{"grant_nopriv", 335544553}, +{"nonsql_security_rel", 335544554}, +{"nonsql_security_fld", 335544555}, +{"wal_cache_err", 335544556}, +{"shutfail", 335544557}, +{"check_constraint", 335544558}, +{"bad_svc_handle", 335544559}, +{"shutwarn", 335544560}, +{"wrospbver", 335544561}, +{"bad_spb_form", 335544562}, +{"svcnotdef", 335544563}, +{"no_jrn", 335544564}, +{"transliteration_failed", 335544565}, +{"start_cm_for_wal", 335544566}, +{"wal_ovflow_log_required", 335544567}, +{"text_subtype", 335544568}, +{"dsql_error", 335544569}, +{"dsql_command_err", 335544570}, +{"dsql_constant_err", 335544571}, +{"dsql_cursor_err", 335544572}, +{"dsql_datatype_err", 335544573}, +{"dsql_decl_err", 335544574}, +{"dsql_cursor_update_err", 335544575}, +{"dsql_cursor_open_err", 335544576}, +{"dsql_cursor_close_err", 335544577}, +{"dsql_field_err", 335544578}, +{"dsql_internal_err", 335544579}, +{"dsql_relation_err", 335544580}, +{"dsql_procedure_err", 335544581}, +{"dsql_request_err", 335544582}, +{"dsql_sqlda_err", 335544583}, +{"dsql_var_count_err", 335544584}, +{"dsql_stmt_handle", 335544585}, +{"dsql_function_err", 335544586}, +{"dsql_blob_err", 335544587}, +{"collation_not_found", 335544588}, +{"collation_not_for_charset", 335544589}, +{"dsql_dup_option", 335544590}, +{"dsql_tran_err", 335544591}, +{"dsql_invalid_array", 335544592}, +{"dsql_max_arr_dim_exceeded", 335544593}, +{"dsql_arr_range_error", 335544594}, +{"dsql_trigger_err", 335544595}, +{"dsql_subselect_err", 335544596}, +{"dsql_crdb_prepare_err", 335544597}, +{"specify_field_err", 335544598}, +{"num_field_err", 335544599}, +{"col_name_err", 335544600}, +{"where_err", 335544601}, +{"table_view_err", 335544602}, +{"distinct_err", 335544603}, +{"key_field_count_err", 335544604}, +{"subquery_err", 335544605}, +{"expression_eval_err", 335544606}, +{"node_err", 335544607}, +{"command_end_err", 335544608}, +{"index_name", 335544609}, +{"exception_name", 335544610}, +{"field_name", 335544611}, +{"token_err", 335544612}, +{"union_err", 335544613}, +{"dsql_construct_err", 335544614}, +{"field_aggregate_err", 335544615}, +{"field_ref_err", 335544616}, +{"order_by_err", 335544617}, +{"return_mode_err", 335544618}, +{"extern_func_err", 335544619}, +{"alias_conflict_err", 335544620}, +{"procedure_conflict_error", 335544621}, +{"relation_conflict_err", 335544622}, +{"dsql_domain_err", 335544623}, +{"idx_seg_err", 335544624}, +{"node_name_err", 335544625}, +{"table_name", 335544626}, +{"proc_name", 335544627}, +{"idx_create_err", 335544628}, +{"wal_shadow_err", 335544629}, +{"dependency", 335544630}, +{"idx_key_err", 335544631}, +{"dsql_file_length_err", 335544632}, +{"dsql_shadow_number_err", 335544633}, +{"dsql_token_unk_err", 335544634}, +{"dsql_no_relation_alias", 335544635}, +{"indexname", 335544636}, +{"no_stream_plan", 335544637}, +{"stream_twice", 335544638}, +{"stream_not_found", 335544639}, +{"collation_requires_text", 335544640}, +{"dsql_domain_not_found", 335544641}, +{"index_unused", 335544642}, +{"dsql_self_join", 335544643}, +{"stream_bof", 335544644}, +{"stream_crack", 335544645}, +{"db_or_file_exists", 335544646}, +{"invalid_operator", 335544647}, +{"conn_lost", 335544648}, +{"bad_checksum", 335544649}, +{"page_type_err", 335544650}, +{"ext_readonly_err", 335544651}, +{"sing_select_err", 335544652}, +{"psw_attach", 335544653}, +{"psw_start_trans", 335544654}, +{"invalid_direction", 335544655}, +{"dsql_var_conflict", 335544656}, +{"dsql_no_blob_array", 335544657}, +{"dsql_base_table", 335544658}, +{"duplicate_base_table", 335544659}, +{"view_alias", 335544660}, +{"index_root_page_full", 335544661}, +{"dsql_blob_type_unknown", 335544662}, +{"req_max_clones_exceeded", 335544663}, +{"dsql_duplicate_spec", 335544664}, +{"unique_key_violation", 335544665}, +{"srvr_version_too_old", 335544666}, +{"drdb_completed_with_errs", 335544667}, +{"dsql_procedure_use_err", 335544668}, +{"dsql_count_mismatch", 335544669}, +{"blob_idx_err", 335544670}, +{"array_idx_err", 335544671}, +{"key_field_err", 335544672}, +{"no_delete", 335544673}, +{"del_last_field", 335544674}, +{"sort_err", 335544675}, +{"sort_mem_err", 335544676}, +{"version_err", 335544677}, +{"inval_key_posn", 335544678}, +{"no_segments_err", 335544679}, +{"crrp_data_err", 335544680}, +{"rec_size_err", 335544681}, +{"dsql_field_ref", 335544682}, +{"req_depth_exceeded", 335544683}, +{"no_field_access", 335544684}, +{"no_dbkey", 335544685}, +{"jrn_format_err", 335544686}, +{"jrn_file_full", 335544687}, +{"dsql_open_cursor_request", 335544688}, +{"ib_error", 335544689}, +{"cache_redef", 335544690}, +{"cache_too_small", 335544691}, +{"log_redef", 335544692}, +{"log_too_small", 335544693}, +{"partition_too_small", 335544694}, +{"partition_not_supp", 335544695}, +{"log_length_spec", 335544696}, +{"precision_err", 335544697}, +{"scale_nogt", 335544698}, +{"expec_short", 335544699}, +{"expec_long", 335544700}, +{"expec_ushort", 335544701}, +{"like_escape_invalid", 335544702}, +{"svcnoexe", 335544703}, +{"net_lookup_err", 335544704}, +{"service_unknown", 335544705}, +{"host_unknown", 335544706}, +{"grant_nopriv_on_base", 335544707}, +{"dyn_fld_ambiguous", 335544708}, +{"dsql_agg_ref_err", 335544709}, +{"complex_view", 335544710}, +{"unprepared_stmt", 335544711}, +{"expec_positive", 335544712}, +{"dsql_sqlda_value_err", 335544713}, +{"invalid_array_id", 335544714}, +{"extfile_uns_op", 335544715}, +{"svc_in_use", 335544716}, +{"err_stack_limit", 335544717}, +{"invalid_key", 335544718}, +{"net_init_error", 335544719}, +{"loadlib_failure", 335544720}, +{"network_error", 335544721}, +{"net_connect_err", 335544722}, +{"net_connect_listen_err", 335544723}, +{"net_event_connect_err", 335544724}, +{"net_event_listen_err", 335544725}, +{"net_read_err", 335544726}, +{"net_write_err", 335544727}, +{"integ_index_deactivate", 335544728}, +{"integ_deactivate_primary", 335544729}, +{"cse_not_supported", 335544730}, +{"tra_must_sweep", 335544731}, +{"unsupported_network_drive", 335544732}, +{"io_create_err", 335544733}, +{"io_open_err", 335544734}, +{"io_close_err", 335544735}, +{"io_read_err", 335544736}, +{"io_write_err", 335544737}, +{"io_delete_err", 335544738}, +{"io_access_err", 335544739}, +{"udf_exception", 335544740}, +{"lost_db_connection", 335544741}, +{"no_write_user_priv", 335544742}, +{"token_too_long", 335544743}, +{"max_att_exceeded", 335544744}, +{"login_same_as_role_name", 335544745}, +{"reftable_requires_pk", 335544746}, +{"usrname_too_long", 335544747}, +{"password_too_long", 335544748}, +{"usrname_required", 335544749}, +{"password_required", 335544750}, +{"bad_protocol", 335544751}, +{"dup_usrname_found", 335544752}, +{"usrname_not_found", 335544753}, +{"error_adding_sec_record", 335544754}, +{"error_modifying_sec_record", 335544755}, +{"error_deleting_sec_record", 335544756}, +{"error_updating_sec_db", 335544757}, +{"sort_rec_size_err", 335544758}, +{"bad_default_value", 335544759}, +{"invalid_clause", 335544760}, +{"too_many_handles", 335544761}, +{"optimizer_blk_exc", 335544762}, +{"invalid_string_constant", 335544763}, +{"transitional_date", 335544764}, +{"read_only_database", 335544765}, +{"must_be_dialect_2_and_up", 335544766}, +{"blob_filter_exception", 335544767}, +{"exception_access_violation", 335544768}, +{"exception_datatype_missalignmen", 335544769}, +{"exception_array_bounds_exceeded", 335544770}, +{"exception_float_denormal_operan", 335544771}, +{"exception_float_divide_by_zero", 335544772}, +{"exception_float_inexact_result", 335544773}, +{"exception_float_invalid_operand", 335544774}, +{"exception_float_overflow", 335544775}, +{"exception_float_stack_check", 335544776}, +{"exception_float_underflow", 335544777}, +{"exception_integer_divide_by_zer", 335544778}, +{"exception_integer_overflow", 335544779}, +{"exception_unknown", 335544780}, +{"exception_stack_overflow", 335544781}, +{"exception_sigsegv", 335544782}, +{"exception_sigill", 335544783}, +{"exception_sigbus", 335544784}, +{"exception_sigfpe", 335544785}, +{"ext_file_delete", 335544786}, +{"ext_file_modify", 335544787}, +{"adm_task_denied", 335544788}, +{"extract_input_mismatch", 335544789}, +{"insufficient_svc_privileges", 335544790}, +{"file_in_use", 335544791}, +{"service_att_err", 335544792}, +{"ddl_not_allowed_by_db_sql_dial", 335544793}, +{"cancelled", 335544794}, +{"unexp_spb_form", 335544795}, +{"sql_dialect_datatype_unsupport", 335544796}, +{"svcnouser", 335544797}, +{"depend_on_uncommitted_rel", 335544798}, +{"svc_name_missing", 335544799}, +{"too_many_contexts", 335544800}, +{"datype_notsup", 335544801}, +{"dialect_reset_warning", 335544802}, +{"dialect_not_changed", 335544803}, +{"database_create_failed", 335544804}, +{"inv_dialect_specified", 335544805}, +{"valid_db_dialects", 335544806}, +{"sqlwarn", 335544807}, +{"dtype_renamed", 335544808}, +{"extern_func_dir_error", 335544809}, +{"date_range_exceeded", 335544810}, +{"inv_client_dialect_specified", 335544811}, +{"valid_client_dialects", 335544812}, +{"optimizer_between_err", 335544813}, +{"service_not_supported", 335544814}, +{"generator_name", 335544815}, +{"udf_name", 335544816}, +{"gfix_db_name", 335740929}, +{"gfix_invalid_sw", 335740930}, +{"gfix_incmp_sw", 335740932}, +{"gfix_replay_req", 335740933}, +{"gfix_pgbuf_req", 335740934}, +{"gfix_val_req", 335740935}, +{"gfix_pval_req", 335740936}, +{"gfix_trn_req", 335740937}, +{"gfix_full_req", 335740940}, +{"gfix_usrname_req", 335740941}, +{"gfix_pass_req", 335740942}, +{"gfix_subs_name", 335740943}, +{"gfix_wal_req", 335740944}, +{"gfix_sec_req", 335740945}, +{"gfix_nval_req", 335740946}, +{"gfix_type_shut", 335740947}, +{"gfix_retry", 335740948}, +{"gfix_retry_db", 335740951}, +{"gfix_exceed_max", 335740991}, +{"gfix_corrupt_pool", 335740992}, +{"gfix_mem_exhausted", 335740993}, +{"gfix_bad_pool", 335740994}, +{"gfix_trn_not_valid", 335740995}, +{"gfix_unexp_eoi", 335741012}, +{"gfix_recon_fail", 335741018}, +{"gfix_trn_unknown", 335741036}, +{"gfix_mode_req", 335741038}, +{"gfix_opt_SQL_dialect", 335741039}, +{"dsql_dbkey_from_non_table", 336003074}, +{"dsql_transitional_numeric", 336003075}, +{"dsql_dialect_warning_expr", 336003076}, +{"sql_db_dialect_dtype_unsupport", 336003077}, +{"isc_sql_dialect_conflict_num", 336003079}, +{"dsql_warning_number_ambiguous", 336003080}, +{"dsql_warning_number_ambiguous1", 336003081}, +{"dsql_warn_precision_ambiguous", 336003082}, +{"dsql_warn_precision_ambiguous1", 336003083}, +{"dsql_warn_precision_ambiguous2", 336003084}, +{"dyn_role_does_not_exist", 336068796}, +{"dyn_no_grant_admin_opt", 336068797}, +{"dyn_user_not_role_member", 336068798}, +{"dyn_delete_role_failed", 336068799}, +{"dyn_grant_role_to_user", 336068800}, +{"dyn_inv_sql_role_name", 336068801}, +{"dyn_dup_sql_role", 336068802}, +{"dyn_kywd_spec_for_role", 336068803}, +{"dyn_roles_not_supported", 336068804}, +{"dyn_domain_name_exists", 336068812}, +{"dyn_field_name_exists", 336068813}, +{"dyn_dependency_exists", 336068814}, +{"dyn_dtype_invalid", 336068815}, +{"dyn_char_fld_too_small", 336068816}, +{"dyn_invalid_dtype_conversion", 336068817}, +{"dyn_dtype_conv_invalid", 336068818}, +{"dyn_zero_len_id", 336068820}, +{"gbak_unknown_switch", 336330753}, +{"gbak_page_size_missing", 336330754}, +{"gbak_page_size_toobig", 336330755}, +{"gbak_redir_ouput_missing", 336330756}, +{"gbak_switches_conflict", 336330757}, +{"gbak_unknown_device", 336330758}, +{"gbak_no_protection", 336330759}, +{"gbak_page_size_not_allowed", 336330760}, +{"gbak_multi_source_dest", 336330761}, +{"gbak_filename_missing", 336330762}, +{"gbak_dup_inout_names", 336330763}, +{"gbak_inv_page_size", 336330764}, +{"gbak_db_specified", 336330765}, +{"gbak_db_exists", 336330766}, +{"gbak_unk_device", 336330767}, +{"gbak_blob_info_failed", 336330772}, +{"gbak_unk_blob_item", 336330773}, +{"gbak_get_seg_failed", 336330774}, +{"gbak_close_blob_failed", 336330775}, +{"gbak_open_blob_failed", 336330776}, +{"gbak_put_blr_gen_id_failed", 336330777}, +{"gbak_unk_type", 336330778}, +{"gbak_comp_req_failed", 336330779}, +{"gbak_start_req_failed", 336330780}, +{"gbak_rec_failed", 336330781}, +{"gbak_rel_req_failed", 336330782}, +{"gbak_db_info_failed", 336330783}, +{"gbak_no_db_desc", 336330784}, +{"gbak_db_create_failed", 336330785}, +{"gbak_decomp_len_error", 336330786}, +{"gbak_tbl_missing", 336330787}, +{"gbak_blob_col_missing", 336330788}, +{"gbak_create_blob_failed", 336330789}, +{"gbak_put_seg_failed", 336330790}, +{"gbak_rec_len_exp", 336330791}, +{"gbak_inv_rec_len", 336330792}, +{"gbak_exp_data_type", 336330793}, +{"gbak_gen_id_failed", 336330794}, +{"gbak_unk_rec_type", 336330795}, +{"gbak_inv_bkup_ver", 336330796}, +{"gbak_missing_bkup_desc", 336330797}, +{"gbak_string_trunc", 336330798}, +{"gbak_cant_rest_record", 336330799}, +{"gbak_send_failed", 336330800}, +{"gbak_no_tbl_name", 336330801}, +{"gbak_unexp_eof", 336330802}, +{"gbak_db_format_too_old", 336330803}, +{"gbak_inv_array_dim", 336330804}, +{"gbak_xdr_len_expected", 336330807}, +{"gbak_open_bkup_error", 336330817}, +{"gbak_open_error", 336330818}, +{"gbak_missing_block_fac", 336330934}, +{"gbak_inv_block_fac", 336330935}, +{"gbak_block_fac_specified", 336330936}, +{"gbak_missing_username", 336330940}, +{"gbak_missing_password", 336330941}, +{"gbak_missing_skipped_bytes", 336330952}, +{"gbak_inv_skipped_bytes", 336330953}, +{"gbak_err_restore_charset", 336330965}, +{"gbak_err_restore_collation", 336330967}, +{"gbak_read_error", 336330972}, +{"gbak_write_error", 336330973}, +{"gbak_db_in_use", 336330985}, +{"gbak_sysmemex", 336330990}, +{"gbak_restore_role_failed", 336331002}, +{"gbak_role_op_missing", 336331005}, +{"gbak_page_buffers_missing", 336331010}, +{"gbak_page_buffers_wrong_param", 336331011}, +{"gbak_page_buffers_restore", 336331012}, +{"gbak_inv_size", 336331014}, +{"gbak_file_outof_sequence", 336331015}, +{"gbak_join_file_missing", 336331016}, +{"gbak_stdin_not_supptd", 336331017}, +{"gbak_stdout_not_supptd", 336331018}, +{"gbak_bkup_corrupt", 336331019}, +{"gbak_unk_db_file_spec", 336331020}, +{"gbak_hdr_write_failed", 336331021}, +{"gbak_disk_space_ex", 336331022}, +{"gbak_size_lt_min", 336331023}, +{"gbak_svc_name_missing", 336331025}, +{"gbak_not_ownr", 336331026}, +{"gbak_mode_req", 336331031}, +{"gsec_cant_open_db", 336723983}, +{"gsec_switches_error", 336723984}, +{"gsec_no_op_spec", 336723985}, +{"gsec_no_usr_name", 336723986}, +{"gsec_err_add", 336723987}, +{"gsec_err_modify", 336723988}, +{"gsec_err_find_mod", 336723989}, +{"gsec_err_rec_not_found", 336723990}, +{"gsec_err_delete", 336723991}, +{"gsec_err_find_del", 336723992}, +{"gsec_err_find_disp", 336723996}, +{"gsec_inv_param", 336723997}, +{"gsec_op_specified", 336723998}, +{"gsec_pw_specified", 336723999}, +{"gsec_uid_specified", 336724000}, +{"gsec_gid_specified", 336724001}, +{"gsec_proj_specified", 336724002}, +{"gsec_org_specified", 336724003}, +{"gsec_fname_specified", 336724004}, +{"gsec_mname_specified", 336724005}, +{"gsec_lname_specified", 336724006}, +{"gsec_inv_switch", 336724008}, +{"gsec_amb_switch", 336724009}, +{"gsec_no_op_specified", 336724010}, +{"gsec_params_not_allowed", 336724011}, +{"gsec_incompat_switch", 336724012}, +{"gsec_inv_username", 336724044}, +{"gsec_inv_pw_length", 336724045}, +{"gsec_db_specified", 336724046}, +{"gsec_db_admin_specified", 336724047}, +{"gsec_db_admin_pw_specified", 336724048}, +{"gsec_sql_role_specified", 336724049}, +{"license_no_file", 336789504}, +{"license_op_specified", 336789523}, +{"license_op_missing", 336789524}, +{"license_inv_switch", 336789525}, +{"license_inv_switch_combo", 336789526}, +{"license_inv_op_combo", 336789527}, +{"license_amb_switch", 336789528}, +{"license_inv_parameter", 336789529}, +{"license_param_specified", 336789530}, +{"license_param_req", 336789531}, +{"license_syntx_error", 336789532}, +{"license_dup_id", 336789534}, +{"license_inv_id_key", 336789535}, +{"license_err_remove", 336789536}, +{"license_err_update", 336789537}, +{"license_err_convert", 336789538}, +{"license_err_unk", 336789539}, +{"license_svc_err_add", 336789540}, +{"license_svc_err_remove", 336789541}, +{"license_eval_exists", 336789563}, +{"gstat_unknown_switch", 336920577}, +{"gstat_retry", 336920578}, +{"gstat_wrong_ods", 336920579}, +{"gstat_unexpected_eof", 336920580}, +{"gstat_open_err", 336920605}, +{"gstat_read_err", 336920606}, +{"gstat_sysmemex", 336920607}, diff --git a/src/include/gen/gds_codes.ftn b/src/include/gen/gds_codes.ftn index f667696f2a..aa3b38c541 100644 --- a/src/include/gen/gds_codes.ftn +++ b/src/include/gen/gds_codes.ftn @@ -10,7 +10,7 @@ C -- or implied. See the License for the specific language governing C -- rights and limitations under the License. C -- C -- The content of this file was generated by the Firebird project -C -- using the program jrd/codes.e +C -- using the program jrd/codes.epp C -- C -- C -- diff --git a/src/include/gen/gds_codes.pas b/src/include/gen/gds_codes.pas index 358474a127..f4d48753cb 100644 --- a/src/include/gen/gds_codes.pas +++ b/src/include/gen/gds_codes.pas @@ -10,7 +10,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp *) (* * diff --git a/src/include/gen/iberror.h b/src/include/gen/iberror.h index a5fd7270c6..07dac681ec 100644 --- a/src/include/gen/iberror.h +++ b/src/include/gen/iberror.h @@ -1,3 +1,4 @@ + #ifndef _JRD_GEN_IBERROR_H #define _JRD_GEN_IBERROR_H /* @@ -12,7 +13,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * @@ -31,9 +32,10 @@ /* ISC Error Codes */ /***********************/ -#define isc_facility 20 -#define isc_err_base 335544320L -#define isc_err_factor 1 +#define isc_facility 20 +#define isc_base 335544320L +#define isc_factor 1 + #define isc_arg_end 0 /* end of argument list */ #define isc_arg_gds 1 /* generic DSRI status value */ #define isc_arg_string 2 /* string argument */ @@ -745,4 +747,4 @@ #define isc_gstat_sysmemex 336920607L #define isc_err_max 692 -#endif /* _JRD_GEN_IBERROR_H */ +#endif /* JRD_GEN_IBERROR_H */ diff --git a/src/include/gen/msg_facs.h b/src/include/gen/msg_facs.h index eeda6013e9..9ff6d54d0e 100644 --- a/src/include/gen/msg_facs.h +++ b/src/include/gen/msg_facs.h @@ -10,7 +10,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * @@ -33,9 +33,9 @@ typedef #endif struct _facilities { - int fac_code; + int fac_code; char *facility; -}; + }; static CONST struct _facilities facilities[] = { {0, "JRD "}, diff --git a/src/include/gen/msgs.h b/src/include/gen/msgs.h index e56bbbab37..30f0ccf7ce 100644 --- a/src/include/gen/msgs.h +++ b/src/include/gen/msgs.h @@ -10,7 +10,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * diff --git a/src/include/gen/rdb_codes.h b/src/include/gen/rdb_codes.h index 6a874ffb63..3dc5657e4a 100644 --- a/src/include/gen/rdb_codes.h +++ b/src/include/gen/rdb_codes.h @@ -10,7 +10,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * diff --git a/src/include/gen/sql_code.h b/src/include/gen/sql_code.h index 805bf7d020..5486ffb2cd 100644 --- a/src/include/gen/sql_code.h +++ b/src/include/gen/sql_code.h @@ -10,7 +10,7 @@ * rights and limitations under the License. * * The content of this file was generated by the Firebird project - * using the program jrd/codes.e + * using the program jrd/codes.epp */ /* * diff --git a/src/jrd/alt_use_sec.h b/src/jrd/alt_use_sec.h index 0c93f9e07d..252858baa8 100644 --- a/src/jrd/alt_use_sec.h +++ b/src/jrd/alt_use_sec.h @@ -29,7 +29,7 @@ * John Bellardo * * - * $Id: alt_use_sec.h,v 1.1 2001-12-24 02:50:50 tamlin Exp $ + * $Id: alt_use_sec.h,v 1.2 2002-01-04 11:34:15 skywalker Exp $ * */ diff --git a/src/jrd/builtin.cpp b/src/jrd/builtin.cpp index 49695ebb43..f72ac7a80a 100644 --- a/src/jrd/builtin.cpp +++ b/src/jrd/builtin.cpp @@ -20,7 +20,7 @@ * * All Rights Reserved. * Contributor(s): ______________________________________. - * $Id: builtin.cpp,v 1.3 2001-12-24 02:50:50 tamlin Exp $ + * $Id: builtin.cpp,v 1.4 2002-01-04 11:34:15 skywalker Exp $ */ #include "firebird.h" @@ -46,7 +46,7 @@ FSG 18.Dez.2000 */ - NULL, NULL, NULL /* End of list marker */ + {NULL, NULL, NULL} /* End of list marker */ }; #ifdef SHLIB_DEFS diff --git a/src/jrd/cmp.cpp b/src/jrd/cmp.cpp index 9097511aeb..ef73c704fc 100644 --- a/src/jrd/cmp.cpp +++ b/src/jrd/cmp.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: cmp.cpp,v 1.4 2001-12-24 02:50:51 tamlin Exp $ +$Id: cmp.cpp,v 1.5 2002-01-04 11:34:15 skywalker Exp $ */ #include "firebird.h" @@ -1783,7 +1783,8 @@ REQ DLL_EXPORT CMP_make_request(TDBB tdbb, CSB * csb_ptr) } } - csb_repeat* tail = csb->csb_rpt.begin(); + //csb_repeat* tail = &*(csb->csb_rpt.begin()); + csb_repeat* tail = &(csb->csb_rpt[0]); csb_repeat* end = tail + csb->csb_n_stream; DEBUG; diff --git a/src/jrd/codes.epp b/src/jrd/codes.epp index 1034b67e98..36265889eb 100644 --- a/src/jrd/codes.epp +++ b/src/jrd/codes.epp @@ -91,7 +91,7 @@ static const char *license[] = { "rights and limitations under the License.", "", "The content of this file was generated by the Firebird project", - "using the program jrd/codes.e", + "using the program jrd/codes.epp", 0 }; @@ -371,12 +371,17 @@ static void build_iberror_h(void) ib_fprintf(iberror, "\n"); + ib_fprintf(iberror, "#define isc_facility %d\n", isc_facility); + ib_fprintf(iberror, "#define isc_base %dL\n", isc_base); + ib_fprintf(iberror, "#define isc_factor %d\n", isc_factor); + ib_fprintf(iberror, "\n"); + /* Append the ISC boiler plate */ - for (i = sizeof isc_c_boiler_plate / sizeof(SCHAR *), pp = - isc_c_boiler_plate; i > 0; i--, pp++) { - ib_fprintf(c_codes, "%s\n", *pp); - } + int numLines = sizeof(isc_c_boiler_plate) / sizeof(SCHAR *); + for (int i=0; i < numLines; i++) { + ib_fprintf(iberror, "%s\n", isc_c_boiler_plate[i]); + } /* Fetch error codes from SYSTEM_ERRORS relation. Write them out using the ISC prefix. */ @@ -441,10 +446,11 @@ static void build_codes_h(void) /* Append the C++ boiler plate */ - for (i = sizeof cpp_boiler_plate / sizeof(SCHAR *), pp = cpp_boiler_plate; - i > 0; i--, pp++) { - ib_fprintf(c_codes, "%s\n", *pp); - } + int numLines = sizeof(cpp_boiler_plate) / sizeof(SCHAR *); + for (int i=0; i < numLines; i++) { + ib_fprintf(c_codes, "%s\n", cpp_boiler_plate[i]); + } + FOR S IN SYSTEM_ERRORS CROSS N IN MESSAGES OVER NUMBER WITH N.FAC_CODE = S.FAC_CODE SORTED BY N.FAC_CODE, S.NUMBER @@ -512,10 +518,11 @@ static void build_codes_h(void) last_code = code - 1; new_code = 0L; - for (i = sizeof c_boiler_plate / sizeof(SCHAR *), pp = c_boiler_plate; - i > 0; i--, pp++) { - ib_fprintf(c_codes, "%s\n", *pp); - } + numLines = sizeof(c_boiler_plate) / sizeof(SCHAR *); + for (int i=0; i < numLines; i++) { + ib_fprintf(c_codes, "%s\n", c_boiler_plate[i]); + } + FOR S IN SYSTEM_ERRORS CROSS N IN MESSAGES OVER NUMBER WITH N.FAC_CODE = S.FAC_CODE SORTED BY N.FAC_CODE, S.NUMBER @@ -580,7 +587,7 @@ static void build_codes_h(void) from gen iberror routine. I now do the include of that file. MOD 17-07-2001 */ - ib_fprintf(c_codes, "#include \"iberror.h\"\n\n"); + ib_fprintf(c_codes, "#include \"gen/iberror.h\"\n\n"); ib_fprintf(c_codes, "#endif /* JRD_GEN_CODES_H */\n"); @@ -635,9 +642,11 @@ CONST\n\ \tgds_err_base\t\t= %ld;\n\ \tgds_err_factor\t\t= %ld;\n", gds_facility, (SLONG) gds_base, (SLONG) gds_factor); - for (i = sizeof pas_boiler_plate / sizeof(SCHAR *), pp = pas_boiler_plate; - i > 0; i--, pp++) - ib_fprintf(pas_codes, "%s\n", *pp); + int numLines = sizeof(pas_boiler_plate) / sizeof(SCHAR *); + for (int i=0; i < numLines; i++) { + ib_fprintf(pas_codes, "%s\n", pas_boiler_plate[i]); + } + /* Start the FORTRAN codes file */ @@ -647,9 +656,10 @@ CONST\n\ + GDS_ERR_BASE,\n\ + GDS_ERR_FACTOR\n"); - for (i = sizeof ftn_boiler_plate_decls / sizeof(SCHAR *), - pp = ftn_boiler_plate_decls; i > 0; i--, pp++) - ib_fprintf(ftn_codes, "%s\n", *pp); + numLines = sizeof(ftn_boiler_plate_decls) / sizeof(SCHAR *); + for (int i=0; i < numLines; i++) { + ib_fprintf(ftn_codes, "%s\n", ftn_boiler_plate_decls[i]); + } ib_fprintf(ftn_codes, "\n\ PARAMETER (\n\ @@ -657,9 +667,11 @@ CONST\n\ + GDS_ERR_BASE = %ld,\n\ + GDS_ERR_FACTOR = %ld)\n", gds_facility, (SLONG) gds_base, (SLONG) gds_factor); - for (i = sizeof ftn_boiler_plate_data / sizeof(SCHAR *), - pp = ftn_boiler_plate_data; i > 0; i--, pp++) - ib_fprintf(ftn_codes, "%s\n", *pp); + numLines = sizeof(ftn_boiler_plate_data) / sizeof(SCHAR *); + for (int i=0; i < numLines; i++) { + ib_fprintf(ftn_codes, "%s\n", ftn_boiler_plate_data[i]); + } + /* Start the MSGS file */ diff --git a/src/jrd/dfw.epp b/src/jrd/dfw.epp index 2b99a63818..9a07ef4c20 100644 --- a/src/jrd/dfw.epp +++ b/src/jrd/dfw.epp @@ -3179,7 +3179,7 @@ static FMT make_format( TDBB tdbb, REL relation, USHORT version, TFB stack) if (desc2->dsc_dtype) { old_offset = offset; - offset = MET_align(desc2, (USHORT) offset); + offset = MET_align(&*desc2, (USHORT) offset); /* see of record too big */ @@ -3241,7 +3241,8 @@ static FMT make_format( TDBB tdbb, REL relation, USHORT version, TFB stack) blob = BLB_create(tdbb, dbb->dbb_sys_trans, (BID)&FMT.RDB$DESCRIPTOR); BLB_put_segment(tdbb, blob, - (UCHAR*)format->fmt_desc.begin(), +// (UCHAR*) &*(format->fmt_desc.begin()), + (UCHAR*) &(format->fmt_desc[0]), (USHORT)(format->fmt_count * sizeof(struct dsc))); BLB_close(tdbb, blob); END_STORE; diff --git a/src/jrd/dpm.epp b/src/jrd/dpm.epp index 720b63bea9..10f7c8edc5 100644 --- a/src/jrd/dpm.epp +++ b/src/jrd/dpm.epp @@ -1978,16 +1978,19 @@ SLONG DPM_store_blob(TDBB tdbb, BLB blob, REC record) length = vector->count() * sizeof(SLONG); //q = (UCHAR *) vector->vcl_long; // JMB: Not such a good thing with std::vector - q = (UCHAR *) vector->begin(); + q = (UCHAR *) &*(vector->begin()); +// q = (UCHAR *) &(vector->[0]); } /* Figure out precedence pages, if any */ stack = NULL; - if (blob->blb_level > 0) - for (ptr = vector->begin(), end = vector->end(); - ptr < end;) LLS_PUSH((BLK) * ptr++, &stack); + if (blob->blb_level > 0) { + for (ptr = vector->begin(), end = vector->end(); ptr < end;) { + LLS_PUSH((BLK) * ptr++, &stack); + } + } /* Locate space to store blob */ diff --git a/src/jrd/event.cpp b/src/jrd/event.cpp index da57f42815..0e66cd1530 100644 --- a/src/jrd/event.cpp +++ b/src/jrd/event.cpp @@ -126,10 +126,10 @@ static MTX_T event_mutex[1]; static struct ipccfg EVENT_hdrtbl[] = { #if !(defined WIN_NT) - "V4_EVENT_MEM_SIZE", -1, &EVENT_default_size, 0, 0, - "ANY_EVENT_MEM_SIZE", -1, &EVENT_default_size, -1, 0, + {"V4_EVENT_MEM_SIZE", -1, &EVENT_default_size, 0, 0}, + {"ANY_EVENT_MEM_SIZE", -1, &EVENT_default_size, -1, 0}, #endif - NULL, -1, NULL, 0, 0 + {NULL, -1, NULL, 0, 0} }; diff --git a/src/jrd/functions.cpp b/src/jrd/functions.cpp index 1643c226aa..773360e105 100644 --- a/src/jrd/functions.cpp +++ b/src/jrd/functions.cpp @@ -46,8 +46,8 @@ static int test(long, char *); #pragma FB_COMPILER_MESSAGE("Fix! function pointer cast!") static FN isc_functions[] = { - "test_module", "test_function", (int (*)()) test, - 0, 0, 0 + {"test_module", "test_function", (int (*)()) test}, + {0, 0, 0} }; #ifdef SHLIB_DEFS diff --git a/src/jrd/gds.cpp b/src/jrd/gds.cpp index dace62ed10..ea5e2162b8 100644 --- a/src/jrd/gds.cpp +++ b/src/jrd/gds.cpp @@ -2461,6 +2461,7 @@ void API_ROUTINE gds__prefix(TEXT * resultString, TEXT * root) { // Try and get value from config file. const Firebird::string regPrefix = FirebirdConfig::getSysString("RootDirectory"); + int len = regPrefix.length(); if ( len > 0) { if (len > sizeof(ib_prefix_val)) { @@ -3498,12 +3499,14 @@ void API_ROUTINE gds__unregister_cleanup(FPTR_VOID_PTR routine, void *arg) CLEAN *clean_ptr, clean; for (clean_ptr = &cleanup_handlers; clean = *clean_ptr; - clean_ptr = &clean->clean_next) if (clean->clean_routine == routine - && clean->clean_arg == arg) { + clean_ptr = &clean->clean_next) { + if (clean->clean_routine == routine + && clean->clean_arg == arg) { *clean_ptr = clean->clean_next; FREE_LIB_MEMORY(clean); break; } + } } diff --git a/src/jrd/ini.epp b/src/jrd/ini.epp index 6158be73e7..11ccca1506 100644 --- a/src/jrd/ini.epp +++ b/src/jrd/ini.epp @@ -662,7 +662,7 @@ void INI_init2(void) { if (n-- > 0) { - format->fmt_length = (USHORT)MET_align(desc, format->fmt_length); + format->fmt_length = (USHORT)MET_align(&*desc, format->fmt_length); desc->dsc_address = (UCHAR*) (SLONG) format->fmt_length; format->fmt_length += desc->dsc_length; } diff --git a/src/jrd/isc.cpp b/src/jrd/isc.cpp index 5068e554a2..65c65abf82 100644 --- a/src/jrd/isc.cpp +++ b/src/jrd/isc.cpp @@ -24,7 +24,7 @@ * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden */ /* -$Id: isc.cpp,v 1.5 2001-12-24 02:50:51 tamlin Exp $ +$Id: isc.cpp,v 1.6 2002-01-04 11:34:15 skywalker Exp $ */ #ifdef DARWIN #define _STLP_CCTYPE @@ -51,50 +51,31 @@ $Id: isc.cpp,v 1.5 2001-12-24 02:50:51 tamlin Exp $ /* Initialize the structure that hold all the config information */ static struct cfgtbl ISC_def_cfg_tbl[] = { - ISCCFG_LOCKMEM, ISCCFG_LOCKMEM_KEY, ISCCFG_LOCKMEM_DEF, - ISCCFG_LOCKMEM_DEF, - ISCCFG_LOCKSEM, ISCCFG_LOCKSEM_KEY, ISCCFG_LOCKSEM_DEF, - ISCCFG_LOCKSEM_DEF, - ISCCFG_LOCKSIG, ISCCFG_LOCKSIG_KEY, ISCCFG_LOCKSIG_DEF, - ISCCFG_LOCKSIG_DEF, - ISCCFG_EVNTMEM, ISCCFG_EVNTMEM_KEY, ISCCFG_EVNTMEM_DEF, - ISCCFG_EVNTMEM_DEF, - ISCCFG_DBCACHE, ISCCFG_DBCACHE_KEY, ISCCFG_DBCACHE_DEF, - ISCCFG_DBCACHE_DEF, - ISCCFG_PRIORITY, ISCCFG_PRIORITY_KEY, ISCCFG_PRIORITY_DEF, - ISCCFG_PRIORITY_DEF, - ISCCFG_IPCMAP, ISCCFG_IPCMAP_KEY, ISCCFG_IPCMAP_DEF, ISCCFG_IPCMAP_DEF, - ISCCFG_MEMMIN, ISCCFG_MEMMIN_KEY, ISCCFG_MEMMIN_DEF, ISCCFG_MEMMIN_DEF, - ISCCFG_MEMMAX, ISCCFG_MEMMAX_KEY, ISCCFG_MEMMAX_DEF, ISCCFG_MEMMAX_DEF, - ISCCFG_LOCKORDER, ISCCFG_LOCKORDER_KEY, ISCCFG_LOCKORDER_DEF, - ISCCFG_LOCKORDER_DEF, - ISCCFG_ANYLOCKMEM, ISCCFG_ANYLOCKMEM_KEY, ISCCFG_ANYLOCKMEM_DEF, - ISCCFG_ANYLOCKMEM_DEF, - ISCCFG_ANYLOCKSEM, ISCCFG_ANYLOCKSEM_KEY, ISCCFG_ANYLOCKSEM_DEF, - ISCCFG_ANYLOCKSEM_DEF, - ISCCFG_ANYLOCKSIG, ISCCFG_ANYLOCKSIG_KEY, ISCCFG_ANYLOCKSIG_DEF, - ISCCFG_ANYLOCKSIG_DEF, - ISCCFG_ANYEVNTMEM, ISCCFG_ANYEVNTMEM_KEY, ISCCFG_ANYEVNTMEM_DEF, - ISCCFG_ANYEVNTMEM_DEF, - ISCCFG_LOCKHASH, ISCCFG_LOCKHASH_KEY, ISCCFG_LOCKHASH_DEF, - ISCCFG_LOCKHASH_DEF, - ISCCFG_DEADLOCK, ISCCFG_DEADLOCK_KEY, ISCCFG_DEADLOCK_DEF, - ISCCFG_DEADLOCK_DEF, - ISCCFG_LOCKSPIN, ISCCFG_LOCKSPIN_KEY, ISCCFG_LOCKSPIN_DEF, - ISCCFG_LOCKSPIN_DEF, - ISCCFG_CONN_TIMEOUT, ISCCFG_CONN_TIMEOUT_KEY, ISCCFG_CONN_TIMEOUT_DEF, - ISCCFG_CONN_TIMEOUT_DEF, - ISCCFG_DUMMY_INTRVL, ISCCFG_DUMMY_INTRVL_KEY, ISCCFG_DUMMY_INTRVL_DEF, - ISCCFG_DUMMY_INTRVL_DEF, - ISCCFG_TRACE_POOLS, ISCCFG_TRACE_POOLS_KEY, ISCCFG_TRACE_POOLS_DEF, - ISCCFG_TRACE_POOLS_DEF, - ISCCFG_REMOTE_BUFFER, ISCCFG_REMOTE_BUFFER_KEY, ISCCFG_REMOTE_BUFFER_DEF, - ISCCFG_REMOTE_BUFFER_DEF, + {ISCCFG_LOCKMEM, ISCCFG_LOCKMEM_KEY, ISCCFG_LOCKMEM_DEF, ISCCFG_LOCKMEM_DEF}, + {ISCCFG_LOCKSEM, ISCCFG_LOCKSEM_KEY, ISCCFG_LOCKSEM_DEF, ISCCFG_LOCKSEM_DEF}, + {ISCCFG_LOCKSIG, ISCCFG_LOCKSIG_KEY, ISCCFG_LOCKSIG_DEF, ISCCFG_LOCKSIG_DEF}, + {ISCCFG_EVNTMEM, ISCCFG_EVNTMEM_KEY, ISCCFG_EVNTMEM_DEF, ISCCFG_EVNTMEM_DEF}, + {ISCCFG_DBCACHE, ISCCFG_DBCACHE_KEY, ISCCFG_DBCACHE_DEF, ISCCFG_DBCACHE_DEF}, + {ISCCFG_PRIORITY, ISCCFG_PRIORITY_KEY, ISCCFG_PRIORITY_DEF, ISCCFG_PRIORITY_DEF}, + {ISCCFG_IPCMAP, ISCCFG_IPCMAP_KEY, ISCCFG_IPCMAP_DEF, ISCCFG_IPCMAP_DEF}, + {ISCCFG_MEMMIN, ISCCFG_MEMMIN_KEY, ISCCFG_MEMMIN_DEF, ISCCFG_MEMMIN_DEF}, + {ISCCFG_MEMMAX, ISCCFG_MEMMAX_KEY, ISCCFG_MEMMAX_DEF, ISCCFG_MEMMAX_DEF}, + {ISCCFG_LOCKORDER, ISCCFG_LOCKORDER_KEY, ISCCFG_LOCKORDER_DEF, ISCCFG_LOCKORDER_DEF}, + {ISCCFG_ANYLOCKMEM, ISCCFG_ANYLOCKMEM_KEY, ISCCFG_ANYLOCKMEM_DEF, ISCCFG_ANYLOCKMEM_DEF}, + {ISCCFG_ANYLOCKSEM, ISCCFG_ANYLOCKSEM_KEY, ISCCFG_ANYLOCKSEM_DEF, ISCCFG_ANYLOCKSEM_DEF}, + {ISCCFG_ANYLOCKSIG, ISCCFG_ANYLOCKSIG_KEY, ISCCFG_ANYLOCKSIG_DEF, ISCCFG_ANYLOCKSIG_DEF}, + {ISCCFG_ANYEVNTMEM, ISCCFG_ANYEVNTMEM_KEY, ISCCFG_ANYEVNTMEM_DEF, ISCCFG_ANYEVNTMEM_DEF}, + {ISCCFG_LOCKHASH, ISCCFG_LOCKHASH_KEY, ISCCFG_LOCKHASH_DEF, ISCCFG_LOCKHASH_DEF}, + {ISCCFG_DEADLOCK, ISCCFG_DEADLOCK_KEY, ISCCFG_DEADLOCK_DEF, ISCCFG_DEADLOCK_DEF}, + {ISCCFG_LOCKSPIN, ISCCFG_LOCKSPIN_KEY, ISCCFG_LOCKSPIN_DEF, ISCCFG_LOCKSPIN_DEF}, + {ISCCFG_CONN_TIMEOUT, ISCCFG_CONN_TIMEOUT_KEY, ISCCFG_CONN_TIMEOUT_DEF, ISCCFG_CONN_TIMEOUT_DEF}, + {ISCCFG_DUMMY_INTRVL, ISCCFG_DUMMY_INTRVL_KEY, ISCCFG_DUMMY_INTRVL_DEF, ISCCFG_DUMMY_INTRVL_DEF}, + {ISCCFG_TRACE_POOLS, ISCCFG_TRACE_POOLS_KEY, ISCCFG_TRACE_POOLS_DEF, ISCCFG_TRACE_POOLS_DEF}, + {ISCCFG_REMOTE_BUFFER, ISCCFG_REMOTE_BUFFER_KEY, ISCCFG_REMOTE_BUFFER_DEF, ISCCFG_REMOTE_BUFFER_DEF}, #ifdef SET_TCP_NO_DELAY - ISCCFG_NO_NAGLE, ISCCFG_NO_NAGLE_KEY, ISCCFG_NO_NAGLE_DEF, - ISCCFG_NO_NAGLE_DEF, + {ISCCFG_NO_NAGLE, ISCCFG_NO_NAGLE_KEY, ISCCFG_NO_NAGLE_DEF, ISCCFG_NO_NAGLE_DEF}, #endif - NULL, 0, 0, 0 + {NULL, 0, 0, 0} }; static struct cfgtbl *ISC_cfg_tbl = NULL; diff --git a/src/jrd/jrd.h b/src/jrd/jrd.h index 02bc4a998c..da310469ce 100644 --- a/src/jrd/jrd.h +++ b/src/jrd/jrd.h @@ -632,7 +632,8 @@ public: void clear() { vector.clear(); } void prepend(int n) { vector.insert(vector.begin(), n); } - T* memPtr() { return (T*)begin(); } +// T* memPtr() { return &*(vector.begin()); } + T* memPtr() { return &vector[0]; } void resize(size_t n, T val = T()) { vector.resize(n, val); } diff --git a/src/jrd/met.epp b/src/jrd/met.epp index ef55b8b89d..22c10a0cfc 100644 --- a/src/jrd/met.epp +++ b/src/jrd/met.epp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: met.epp,v 1.4 2001-12-28 05:16:31 tamlin Exp $ +$Id: met.epp,v 1.5 2002-01-04 11:34:15 skywalker Exp $ */ // This MUST be at the top of the file #ifdef DARWIN @@ -530,7 +530,8 @@ FMT MET_format(TDBB tdbb, register REL relation, USHORT number) count = blob->blb_length / sizeof(struct dsc); format = fmt::newFmt(*dbb->dbb_permanent, count); format->fmt_count = count; - BLB_get_data(tdbb, blob, (UCHAR*)format->fmt_desc.begin(), blob->blb_length); +// BLB_get_data(tdbb, blob, (UCHAR*) &*(format->fmt_desc.begin()), blob->blb_length); + BLB_get_data(tdbb, blob, (UCHAR*) &(format->fmt_desc[0]), blob->blb_length); for (desc = format->fmt_desc.end() - 1; desc >= format->fmt_desc.begin(); @@ -2511,7 +2512,7 @@ PRC MET_procedure(TDBB tdbb, int id, USHORT flags) if (parameter) { *desc = parameter->prm_desc; - length = MET_align(desc, length); + length = MET_align(&*desc, length); desc->dsc_address = (UCHAR *) length; length += desc->dsc_length; } @@ -3718,7 +3719,7 @@ static BOOLEAN par_messages(TDBB tdbb, format->fmt_count = count; offset = 0; for (desc = format->fmt_desc.begin(); count; --count, ++desc) { - align = PAR_desc(csb, desc); + align = PAR_desc(csb, &*desc); if (align) offset = FB_ALIGN(offset, align); desc->dsc_address = (UCHAR *) offset; diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp index 9de0d6be12..2b236f87b9 100644 --- a/src/jrd/opt.cpp +++ b/src/jrd/opt.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: opt.cpp,v 1.3 2001-12-24 02:50:51 tamlin Exp $ +$Id: opt.cpp,v 1.4 2002-01-04 11:34:16 skywalker Exp $ */ #include "firebird.h" @@ -4175,7 +4175,8 @@ static BOOLEAN gen_sort_merge(TDBB tdbb, OPT opt, LLS * org_rivers) } scratch = vec::newVector(*dbb->dbb_permanent, opt->opt_count * cnt); - classes = (NOD *) scratch->begin(); + classes = (NOD *) &*(scratch->begin()); + // classes = (NOD *) &(scratch->[0]); /* Compute equivalence classes among streams. This involves finding groups of streams joined by field equalities. */ last_class = classes; diff --git a/src/jrd/par.cpp b/src/jrd/par.cpp index fdfb33e4d2..84c620fc32 100644 --- a/src/jrd/par.cpp +++ b/src/jrd/par.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: par.cpp,v 1.4 2001-12-24 02:50:52 tamlin Exp $ +$Id: par.cpp,v 1.5 2002-01-04 11:34:16 skywalker Exp $ */ #include "firebird.h" @@ -75,7 +75,7 @@ static CONST struct { SLONG code_number; } FAR_VARIABLE codes[] = { #include "gen/codetext.h" - NULL, 0 + {NULL, 0} }; static void error(CSB, ...); @@ -1459,7 +1459,7 @@ static NOD par_message(TDBB tdbb, CSB * csb) offset = 0; for (desc = format->fmt_desc.begin(), end = desc + n; desc < end; desc++) { - alignment = PAR_desc(csb, desc); + alignment = PAR_desc(csb, &*desc); if (alignment) offset = FB_ALIGN(offset, alignment); desc->dsc_address = (UCHAR *) (SLONG) offset; diff --git a/src/jrd/perf.cpp b/src/jrd/perf.cpp index 0c8914e409..610dff8393 100644 --- a/src/jrd/perf.cpp +++ b/src/jrd/perf.cpp @@ -78,6 +78,10 @@ extern void ftime(); #define TICK 100 #endif +#if defined(CLOCKS_PER_SEC) +#define TICK CLOCKS_PER_SEC +#endif + #ifndef TICK #define TICK CLK_TCK #endif diff --git a/src/jrd/sbm.cpp b/src/jrd/sbm.cpp index c818315633..46d9e76652 100644 --- a/src/jrd/sbm.cpp +++ b/src/jrd/sbm.cpp @@ -104,11 +104,11 @@ SBM *SBM_and(register SBM * bitmap1, register SBM * bitmap2) *bucket1 = NULL; } else if (!(result_bucket = - SBM_and((SBM*)bucket1, (SBM*)bucket2))) { - bucket_reset((SBM)*bucket1); + SBM_and((SBM*) &*bucket1, (SBM*) &*bucket2))) { + bucket_reset((SBM) *bucket1); *bucket1 = NULL; } - else if (result_bucket == (SBM*) bucket2) { + else if (result_bucket == (SBM*) &*bucket2) { temp = (SBM)*bucket2; *bucket2 = *bucket1; *bucket1 = (BMS)temp; @@ -644,8 +644,10 @@ SBM *SBM_or(register SBM * bitmap1, register SBM * bitmap2) SBM *bucket1, *bucket2, *end_buckets; SBM temp; - bucket1 = (SBM *) map1->sbm_segments.begin(); - bucket2 = (SBM *) map2->sbm_segments.begin(); + //bucket1 = (SBM *) &*(map1->sbm_segments.begin()); + //bucket2 = (SBM *) &*(map2->sbm_segments.begin()); + bucket1 = (SBM *) &(map1->sbm_segments[0]); + bucket2 = (SBM *) &(map2->sbm_segments[0]); end_buckets = bucket2 + map2->sbm_high_water + 1; for (; bucket2 < end_buckets; bucket1++, bucket2++) { diff --git a/src/jrd/scl.epp b/src/jrd/scl.epp index 41475abdfc..75f0a78381 100644 --- a/src/jrd/scl.epp +++ b/src/jrd/scl.epp @@ -1093,7 +1093,7 @@ static SLONG compute_access(TDBB tdbb, ULONG old_offset = (ULONG) (acl - buffer); length += BLOB_BUFFER_SIZE; // TMN: Cast away volatile - str::extend(const_cast(str_buffer), length); + str::extend(const_cast(str_buffer), length); buffer = (TEXT*) str_buffer->str_data; acl = buffer + old_offset; } diff --git a/src/jrd/svc.cpp b/src/jrd/svc.cpp index ebfd21df6d..26cfc4d43b 100644 --- a/src/jrd/svc.cpp +++ b/src/jrd/svc.cpp @@ -374,29 +374,29 @@ static const serv services[] = { 0, NULL, NULL, NULL, NULL, 0 } }; #else /* LINUX: disallow services API for 6.0 Linux Classic */ - isc_action_max, "anonymous", NULL, NULL, NULL, 0, + {isc_action_max, "anonymous", NULL, NULL, NULL, 0}, #ifdef SUPERSERVER - isc_action_max, "query_server", NULL, NULL, NULL, 0, - isc_action_max, "service_mgr", NULL, NULL, NULL, 0, - isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", reinterpret_cast(MAIN_GBAK), 0, - isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", reinterpret_cast(MAIN_GBAK), 0, - isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", reinterpret_cast(MAIN_GFIX), 0, - isc_action_svc_add_user, "Add User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0, - isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0, - isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0, - isc_action_svc_display_user, "Display User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0, - isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", reinterpret_cast(MAIN_GFIX), 0, - isc_action_svc_lock_stats, "Lock Stats", NULL, NULL, reinterpret_cast(TEST_THREAD), 0, - isc_action_svc_db_stats, "Database Stats", NULL, NULL, reinterpret_cast(MAIN_GSTAT), 0, - isc_action_svc_get_ib_log, "Get Log File", NULL, NULL, reinterpret_cast(SVC_read_ib_log), 0, + {isc_action_max, "query_server", NULL, NULL, NULL, 0}, + {isc_action_max, "service_mgr", NULL, NULL, NULL, 0}, + {isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", reinterpret_cast(MAIN_GBAK), 0}, + {isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", reinterpret_cast(MAIN_GBAK), 0}, + {isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", reinterpret_cast(MAIN_GFIX), 0}, + {isc_action_svc_add_user, "Add User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0}, + {isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0}, + {isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0}, + {isc_action_svc_display_user, "Display User", NULL, "bin/gsec", reinterpret_cast(MAIN_GSEC), 0}, + {isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", reinterpret_cast(MAIN_GFIX), 0}, + {isc_action_svc_lock_stats, "Lock Stats", NULL, NULL, reinterpret_cast(TEST_THREAD), 0}, + {isc_action_svc_db_stats, "Database Stats", NULL, NULL, reinterpret_cast(MAIN_GSTAT), 0}, + {isc_action_svc_get_ib_log, "Get Log File", NULL, NULL, reinterpret_cast(SVC_read_ib_log), 0}, /* actions with no names are undocumented */ - isc_action_svc_set_config, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0, - isc_action_svc_default_config, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0, - isc_action_svc_set_env, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0, - isc_action_svc_set_env_lock, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0, - isc_action_svc_set_env_msg, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0, + {isc_action_svc_set_config, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0}, + {isc_action_svc_default_config, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0}, + {isc_action_svc_set_env, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0}, + {isc_action_svc_set_env_lock, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0}, + {isc_action_svc_set_env_msg, NULL, NULL, NULL, reinterpret_cast(TEST_THREAD), 0}, #endif - 0, NULL, NULL, NULL, NULL, 0 + {0, NULL, NULL, NULL, NULL, 0} }; #endif /* LINUX */ diff --git a/src/jrd/tra.cpp b/src/jrd/tra.cpp index 0769700303..eedf15c319 100644 --- a/src/jrd/tra.cpp +++ b/src/jrd/tra.cpp @@ -905,7 +905,7 @@ BOOLEAN TRA_precommited(TDBB tdbb, SLONG old_number, SLONG new_number) if (*p == old_number) return (*p = new_number) ? TRUE : FALSE; if (!zp && !*p) - zp = p; + zp = &*p; } if (old_number == new_number || new_number == 0) diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp index 2ef45ba55f..ae2988ec6b 100644 --- a/src/jrd/vio.cpp +++ b/src/jrd/vio.cpp @@ -1501,7 +1501,8 @@ REC VIO_gc_record(TDBB tdbb, REL relation) for (rec_ptr = vector->begin(), end = vector->end(); rec_ptr != end; ++rec_ptr) - if ((record = *(REC*)rec_ptr) && !(record->rec_flags & REC_gc_active)) { + if ((record = *(REC*) &*rec_ptr) && !(record->rec_flags & REC_gc_active)) { + // if ((record = *(REC*) &*rec_ptr) && !(record->rec_flags & REC_gc_active)) { record->rec_flags |= REC_gc_active; /* V4_MUTEX_UNLOCK (&relation->rel_mutex); */ return record; diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp index cb775f101f..53076420a8 100644 --- a/src/lock/lock.cpp +++ b/src/lock/lock.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: lock.cpp,v 1.4 2001-12-24 02:50:52 tamlin Exp $ +$Id: lock.cpp,v 1.5 2002-01-04 11:34:16 skywalker Exp $ */ #include "firebird.h" @@ -296,23 +296,23 @@ static struct ipccfg LOCK_hdrtbl[] = { /* 5.5 SCO Port: Classic server on SCO - following is not supported */ #if (!(defined WIN_NT) && !(defined SCO_EV)) - "V4_LOCK_MEM_SIZE" , -1, &LOCK_shm_size , 0, 0, - "ANY_LOCK_MEM_SIZE" , -1, &LOCK_shm_size , -1, 0, + {"V4_LOCK_MEM_SIZE" , -1, &LOCK_shm_size , 0, 0}, + {"ANY_LOCK_MEM_SIZE" , -1, &LOCK_shm_size , -1, 0}, #endif #ifdef STATIC_SEMAPHORES - "V4_LOCK_SEM_COUNT" , -1, &LOCK_sem_count , 0, 0, - "ANY_LOCK_SEM_COUNT" , -1, &LOCK_sem_count , -1, 0, + {"V4_LOCK_SEM_COUNT" , -1, &LOCK_sem_count , 0, 0}, + {"ANY_LOCK_SEM_COUNT" , -1, &LOCK_sem_count , -1, 0}, #endif - "V4_LOCK_SIGNAL" , -1, &LOCK_block_signal , 0, 0, - "ANY_LOCK_SIGNAL" , -1, &LOCK_block_signal , -1, 0, - "V4_LOCK_GRANT_ORDER" , -1, &LOCK_ordering , 0, 0, - "LOCK_HASH_SLOTS" , -1, &LOCK_hash_slots , 0, 0, - "DEADLOCK_TIMEOUT" , -1, &LOCK_scan_interval , 0, 0, - "LOCK_ACQUIRE_SPINS" , -1, &LOCK_acquire_spins , 0, 0, + {"V4_LOCK_SIGNAL" , -1, &LOCK_block_signal , 0, 0}, + {"ANY_LOCK_SIGNAL" , -1, &LOCK_block_signal , -1, 0}, + {"V4_LOCK_GRANT_ORDER" , -1, &LOCK_ordering , 0, 0}, + {"LOCK_HASH_SLOTS" , -1, &LOCK_hash_slots , 0, 0}, + {"DEADLOCK_TIMEOUT" , -1, &LOCK_scan_interval , 0, 0}, + {"LOCK_ACQUIRE_SPINS" , -1, &LOCK_acquire_spins , 0, 0}, #if (defined SOLARIS_MT && !defined SUPERSERVER) - "V4_SOLARIS_STALL_VALUE", -1, &LOCK_solaris_stall , 0, 0, + {"V4_SOLARIS_STALL_VALUE", -1, &LOCK_solaris_stall , 0, 0}, #endif - NULL, 0, NULL, 0, 0 + {NULL, 0, NULL, 0, 0} }; #define GET_TIME time (NULL) diff --git a/src/make.defaults b/src/make.defaults index 5633797959..6df7ce47aa 100644 --- a/src/make.defaults +++ b/src/make.defaults @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: make.defaults,v 1.1 2001-12-24 02:50:47 tamlin Exp $ +# $Id: make.defaults,v 1.2 2002-01-04 11:34:13 skywalker Exp $ # @@ -48,7 +48,7 @@ RealFirebirdPath = $(shell cd $(FIREBIRD); pwd) FirebirdInstallPrefix = /usr/local/firebird -CpuType=powerpc +CpuType=i686 FirebirdVersion=2.0.0 PackageVersion=0a.Dev1 diff --git a/src/make.new/Makefile.in.common.memory b/src/make.new/Makefile.in.common.memory new file mode 100755 index 0000000000..a36cbc98ae --- /dev/null +++ b/src/make.new/Makefile.in.common.memory @@ -0,0 +1,78 @@ +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. You may obtain a copy of the Licence at +# http://www.gnu.org/copyleft/gpl.html +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# Relevant for more details. +# +# This file was created by members of the firebird development team. +# All individual contributions remain the Copyright (C) of those +# individuals. Contributors to this file are either listed here or +# can be obtained from a CVS history command. +# +# All rights reserved. +# +# Created by: Mark O'Donohue +# +# Contributor(s): +# +# +# $Id: Makefile.in.common.memory,v 1.1 2002-01-04 11:34:16 skywalker Exp $ +# + +ROOT=../../.. + +include $(ROOT)/src/make.rules +include $(ROOT)/src/make.defaults +include $(ROOT)/src/make.platform +include $(ROOT)/src/make.shared.variables + +@SET_MAKE@ + +#test1: +# echo $(RealSrcRootPath) +# echo $(ModuleNameX) +# echo $(CURDIR) + +AllObjects= $(FBMemory_Objects) + +Dependancies=$(AllObjects:.o=.d) + + +fbmem_boot : $(LIB)/fbmem_boot.a + +$(LIB)/fbmem_boot.a: $(FBMemory_Objects) + -$(RM) $@ + $(AR) $@ $^ + -$(RANLIB) $@ + $(CHMOD_6) $@ + + +# Build all our objects that belong in the shared library. +.PHONY: jrdlib_dependencies + +jrdlib_dependencies: $(FBMemory_Objects) + + +libtestx.so.2 : $(FBUTIL_Objects) +# g++ -shared -o $@ $^ $(STATICLINK_LIBS) + $(LIB_LINK) $(LIB_LINK_OPTIONS) -o $@ $^ + +# +clean: + -rm $(AllObjects) + -rm $(Dependancies) + +FORCE: + +-include $(Dependancies) + diff --git a/src/make.new/Makefile.in.firebird b/src/make.new/Makefile.in.firebird index 746ce72d95..6e90053b26 100644 --- a/src/make.new/Makefile.in.firebird +++ b/src/make.new/Makefile.in.firebird @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: Makefile.in.firebird,v 1.11 2001-12-24 02:50:52 tamlin Exp $ +# $Id: Makefile.in.firebird,v 1.12 2002-01-04 11:34:16 skywalker Exp $ # ROOT=.. @@ -88,7 +88,7 @@ phase1: $(GPRE_STATIC) $(GPRE_STATIC): $(MAKE) phase1_build -phase1_build: jrd_boot fbutil_boot gpre_boot build_alt_use_boot jrdlib_dependencies gpre_static +phase1_build: jrd_boot fbutil_boot fbmem_boot gpre_boot build_alt_use_boot jrdlib_dependencies gpre_static gpre_static : jrdlib_dependencies $(MAKE) -C gpre $@ @@ -106,6 +106,8 @@ jrd_boot : fbutil_boot : $(MAKE) -C fbutil $@ +fbmem_boot : + $(MAKE) -C common/memory $@ #-------------------------------------------------------------------------- @@ -163,6 +165,7 @@ jrdlib_dependencies : $(MAKE) -C gpre $@ $(MAKE) -C utilities $@ $(MAKE) -C fbutil $@ + $(MAKE) -C common/memory $@ jrdlib_main: jrdlib_dependencies $(MAKE) -C jrd $@ diff --git a/src/make.new/Makefile.in.gpre b/src/make.new/Makefile.in.gpre index 1ad0b01098..ee3a55fa73 100644 --- a/src/make.new/Makefile.in.gpre +++ b/src/make.new/Makefile.in.gpre @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: Makefile.in.gpre,v 1.8 2001-12-24 02:50:52 tamlin Exp $ +# $Id: Makefile.in.gpre,v 1.9 2002-01-04 11:34:16 skywalker Exp $ # ROOT=../.. @@ -75,7 +75,7 @@ gpre_static : $(GPRE_STATIC) gpre : $(GPRE) -$(GPRE_BOOT): $(GPRECommon_Objects) $(GPREBoot_Objects) $(LIB)/jrd_boot.a $(LIB)/fbutil_boot.a +$(GPRE_BOOT): $(GPRECommon_Objects) $(GPREBoot_Objects) $(LIB)/jrd_boot.a $(LIB)/fbutil_boot.a $(LIB)/fbmem_boot.a $(STATICEXE_LINK) -o $(GPRE_BOOT) $^ $(STATICLINK_LIBS) -$(RM) $(GPRE_CURRENT) $(LN) $(@F) $(GPRE_CURRENT) diff --git a/src/make.new/Makefile.in.jrd b/src/make.new/Makefile.in.jrd index acdbbcc816..ff1a355c4b 100644 --- a/src/make.new/Makefile.in.jrd +++ b/src/make.new/Makefile.in.jrd @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: Makefile.in.jrd,v 1.9 2001-12-24 02:50:52 tamlin Exp $ +# $Id: Makefile.in.jrd,v 1.10 2002-01-04 11:34:16 skywalker Exp $ # ROOT=../.. @@ -660,7 +660,9 @@ rebuild_codes: codes codes: codes.o $(STDIO) $(LIBGDS_DEP) -$(RM) codes - $(EXE_LINK) $(LINK_OPTIONS) $(LIBGDS_LINK) $(CXX_INCLUDE_DIRS) -o codes $^ + echo "Hello" + $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $(CXX_INCLUDE_DIRS) $^ -o $@ $(LINK_LIBS) +# $(EXE_LINK) $(LINK_OPTIONS) $(LIBGDS_LINK) $(CXX_INCLUDE_DIRS) -o codes $^ $(CHMOD_7) codes @@ -712,9 +714,14 @@ build_alt_use_main: alt_use_sec.h.pre #blob_filter.cpp: blob_filter.epp # $(GPRE_BOOT) -lang_internal -n -manual -raw -O $< $@ -$(SRC)/codes.cpp: $(SRC)/codes.epp +#$(SRC)/codes.cpp: $(SRC)/codes.epp +codes.cpp: $(SRC)/codes.epp msgs.gdb $(GPRE) -n -manual -raw -string $< $@ + +msg.gdb: + ln -fs $(SRC_ROOT)/refDatabases/msg.gdb msg.gdb + #$(SRC)/fun.cpp: $(SRC)/fun.epp # $(GPRE) -n -gds -raw -ids $< $@ diff --git a/src/make.new/config/config.h.in b/src/make.new/config/config.h.in index 61bd87e9fd..3f7af676c1 100644 --- a/src/make.new/config/config.h.in +++ b/src/make.new/config/config.h.in @@ -6,20 +6,21 @@ #undef HAVE_ASSERT_H #undef HAVE_UNISTD_H #undef HAVE_FCNTL_H +#undef HAVE_GRP_H +#undef HAVE_LIBIO_H #undef HAVE_SYS_TYPES_H +#undef HAVE_SYS_STAT_H +#undef HAVE_SYS_UIO_H +#undef HAVE_SYS_WAIT_H #undef HAVE_TIME_H #undef HAVE_SYS_TIME_H -#undef HAVE_SYS_STAT_H -#undef HAVE_CTYPE_H -#undef HAVE_SYS_UIO_H -#undef HAVE_LIB_IO_H -#undef HAVE_WAIT_H -#undef HAVE_SYS_WAIT_H #undef HAVE_SYS_PARAM_H #undef HAVE_VARARGS_H #undef HAVE_STDARG_H #undef HAVE_STDLIB_H +#undef HAVE_CTYPE_H #undef HAVE_STRING_H +#undef HAVE_LIB_IO_H #undef HAVE_SIGNAL_H #undef HAVE_READLINE_READLINE_H diff --git a/src/make.new/make.rules b/src/make.new/make.rules index d121f81456..7c4a94ed99 100644 --- a/src/make.new/make.rules +++ b/src/make.new/make.rules @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: make.rules,v 1.12 2001-12-24 02:50:52 tamlin Exp $ +# $Id: make.rules,v 1.13 2002-01-04 11:34:16 skywalker Exp $ # #____________________________________________________________________________ @@ -59,7 +59,11 @@ BIN=$(GEN_ROOT)/firebird/bin # This picks up the current directory and maps it to the equivalent module # in the src and gen area. -ModuleName:=$(notdir $(CURDIR)) +RealSrcRootPath = $(shell cd $(SRC_ROOT); pwd) + +#ModuleName:=$(notdir $(CURDIR)) +ModuleName:=$(subst $(RealSrcRootPath)/,,$(CURDIR)) + SRC=$(SRC_ROOT)/$(ModuleName) OBJ=$(GEN_ROOT)/$(ModuleName) DEP=$(OBJ) diff --git a/src/make.new/make.shared.variables b/src/make.new/make.shared.variables index 1eec1a015e..190bc2e93a 100644 --- a/src/make.new/make.shared.variables +++ b/src/make.new/make.shared.variables @@ -23,7 +23,7 @@ JRD_Sources= ail.cpp all.cpp alt.cpp bookmark.cpp blb.cpp blob_filter.cpp btr.cp event.cpp evl.cpp exe.cpp ext.cpp filters.cpp flu.cpp fun.cpp functions.cpp \ gds.cpp grant.cpp idx.cpp inf.cpp ini.cpp intl.cpp inuse.cpp \ isc.cpp isc_file.cpp isc_ipc.cpp isc_sync.cpp \ - jrd.cpp jrn.cpp lck.cpp llio.cpp log.cpp met.cpp memory_pool.cpp \ + jrd.cpp jrn.cpp lck.cpp llio.cpp log.cpp met.cpp \ misc.cpp mov.cpp nav.cpp old.cpp opt.cpp pag.cpp par.cpp pcmet.cpp \ perf.cpp pwd.cpp rec.cpp rlck.cpp \ rng.cpp rse.cpp sbm.cpp sch.cpp scl.cpp \ @@ -139,6 +139,15 @@ FBUTIL_Objects = $(FBUTIL_Sources:%.cpp=$(GEN_ROOT)/fbutil/%.o) FBUTIL_SharedObjects = $(FBUTIL_Objects:.o=.lo) +#________________________________________________________________________ +# +# common/memory + +FBMemory_Sources=allocators.cpp memory_pool.cpp + +FBMemory_Objects = $(FBMemory_Sources:%.cpp=$(GEN_ROOT)/common/memory/%.o) +FBMemory_SharedObjects = $(FB_Objects:.o=.lo) + #________________________________________________________________________ @@ -155,7 +164,8 @@ GDSLIB_Objects = $(JRD_Objects) \ $(WAL_Objects) \ $(GPRELIB_Objects) \ $(SECURITY_Objects) \ - $(FBUTIL_Objects) + $(FBUTIL_Objects) \ + $(FBMemory_Objects) # Notice that $(SECURITY_Objects) are missing, because that file can't be # compiled until later in the build process. @@ -167,4 +177,5 @@ BOOT_GDSLIB_Objects = $(JRD_Objects) \ $(PIPE_Objects) \ $(WAL_Objects) \ $(GPRELIB_Objects) \ - $(FBUTIL_Objects) + $(FBUTIL_Objects) \ + $(FBMemory_Objects) diff --git a/src/make.new/prefix.linux b/src/make.new/prefix.linux index 2594490b59..e50efb017a 100644 --- a/src/make.new/prefix.linux +++ b/src/make.new/prefix.linux @@ -15,7 +15,7 @@ # All Rights Reserved. # Contributor(s): ______________________________________. # Start of file prefix.linux: $(VERSION) $(PLATFORM) -#$Id: prefix.linux,v 1.2 2001-12-24 02:50:52 tamlin Exp $ +#$Id: prefix.linux,v 1.3 2002-01-04 11:34:16 skywalker Exp $ #Revision 1.6 2000/12/01 11:20:31 fsg #Added SHRLIB_EXT to prefix.linux @@ -27,7 +27,9 @@ ifdef IsProdTypeBuild CFLAGS:= -O3 -m486 -DPROD_BUILD $(CFLAGS) else - DEBUG_Sources= grammar.c dbg.cpp dbt.cpp dmp.cpp +# Commented out since new memory model doesn't work with it. + DEBUG_Sources= nodebug.cpp +# DEBUG_Sources= grammar.c dbg.cpp dbt.cpp dmp.cpp CFLAGS:= -ggdb -DDEV_BUILD $(CFLAGS) endif @@ -79,7 +81,8 @@ FUNCTIONS= functions.bin #HOSTNAME= `hostname | cut -d'.' -f1` INCLUDES= include_so include_so_ada -INTL= intl +INTL= +#INTL= intl IO_Sources= unix.cpp diff --git a/src/make.platform b/src/make.platform index c221e60617..439336bf38 100644 --- a/src/make.platform +++ b/src/make.platform @@ -10,69 +10,41 @@ # # The Original Code was created by Inprise Corporation # and its predecessors. Portions created by Inprise Corporation are +# Copyright (C) Inprise Corporation. # -# Copyright (C) 2000 Inprise Corporation # All Rights Reserved. # Contributor(s): ______________________________________. -# Start of file prefix.darwin: $(VERSION) DARWIN -#$Id: make.platform,v 1.1 2001-12-24 02:50:47 tamlin Exp $ +# Start of file prefix.linux: $(VERSION) $(PLATFORM) +#$Id: make.platform,v 1.2 2002-01-04 11:34:13 skywalker Exp $ +#Revision 1.6 2000/12/01 11:20:31 fsg +#Added SHRLIB_EXT to prefix.linux -#_____________________________________________________________________________ -# -# John I've added these here since I copied them from within the makefiles -# to this spot. Just to show where they came from. -# Most of this stuff would need to go at the end of the include file here. -# and not at the beginning. -# MOD 26-July-2001 - - -# Adding to LINK_LIBS to add the framework thing. - - - -# adding another dependancy onto the includes target - - -# End add by me MOD 26-July-2001 -#______________________________________________________________________________ - # use the following to define conditional DEV/PROD compile - + ifdef IsProdTypeBuild - DEBUG_Sources= nodebug.cpp - CFLAGS:= -O3 -DPROD_BUILD $(CFLAGS) + DEBUG_Sources= nodebug.cpp + CFLAGS:= -O3 -m486 -DPROD_BUILD $(CFLAGS) else - #DEBUG_Sources= grammar.c dbg.cpp dbt.cpp dmp.cpp - DEBUG_Sources= nodebug.cpp - CFLAGS:= -ggdb -DDEV_BUILD $(CFLAGS) +# Commented out since new memory model doesn't work with it. + DEBUG_Sources= nodebug.cpp +# DEBUG_Sources= grammar.c dbg.cpp dbt.cpp dmp.cpp + CFLAGS:= -ggdb -DDEV_BUILD $(CFLAGS) endif +#SHRLIB_DIR= -L$(LIB) -FBFW_PREFIX= Firebird2 -FW_NAME= $(FBFW_PREFIX).framework -FW_PATH= $(FIREBIRD) -FB_FRAMEWORK= $(FW_PATH)/$(FW_NAME) -FW_VERS= 1.1.0 -FW_COMPAT_VERS= 1.0.0 -PHASE2_SHLIB_PATH= unset INTERBASE; export DYLD_FRAMEWORK_PATH=$(FIREBIRD); -POST_BUILD_TARGET= darwin_framework -SS_POST_BUILD_TARGET= ss_darwin_framework +CFLAGS:= $(CFLAGS) -DLINUX -Wall -fwritable-strings $(SUPER_FLAG) + +#PIC_J_CFLAGS:= $(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC +#SPECIAL_OBJECTS= j +#UDF_LINK_CMD= gcc +#UDF_CFLAGS= -fPIC -mieee-fp +#UDF_LFLAGS= -shared +#UDF_SHRLIBS= -L$(INTERBASE)/lib -lgds -lm -lc -mieee-fp -ldl -lcrypt -DEBUG_OBJECTS= $($(VERSION)_DEBUG_OBJECTS) -SHRLIB_DIR= $($(VERSION)_SHRLIB_DIR) -SHRLIB_EXT= .dylib -VERSION_FLAG= $($(VERSION)_VERSION_FLAG) -CFLAGS_COMMON= $($(VERSION)_CFLAGS) -w -F$(FW_PATH) -#CFLAGS= $(CFLAGS_COMMON) $(SUPER_FLAG) -PIC_J_CFLAGS= $(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -dynamic -fno-common -SPECIAL_OBJECTS= j -UDF_LINK_CMD= libtool -UDF_CFLAGS= -dynamic -fno-common -UDF_LFLAGS= -dynamic -UDF_SHRLIBS= -lcc_dynamic -framework System #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules # to workaround the Solaris threading problems with signals @@ -81,173 +53,93 @@ UDF_SHRLIBS= -lcc_dynamic -framework System #NOTE: -Xt is ANSI C transition mode (default) # -DBDS_COMP is for BSD Compatibility package and is used in -ACCESS_METHOD= gdslib.dylib pipe -BACKEND_BRIDGE_MISC= $(OBJS)/pipe/head5.o $(OBJS)/pipe/allp.o -BIN_PATH= /usr/isc/bin -BRIDGE_MISC= $(OBJS)/pipe/head5.o $(OBJS)/pipe/allp.o -CHMOD_VAL= 666 -CURSES_LIB= -DSQL_P_OBJS= dsql_p_objects -FORM_OBJECTS= form.o -FORM_TRN_OBJECTS= form_trn.o + +#ACCESS_METHOD= gdslib.linux pipe + + +#CHMOD_VAL= 666 + + FUNCTIONS= functions.bin -FUNCSHR= $(OBJS)/firebird/lib/gdsf.so -DROP_LINK= $(GDS_LINK) -GDS_LINK= $(GDSSHR_LINK) -GDS_PYXIS= gds_pyxis.a -GDSLIB_BACKEND= $(OBJS)/firebird/lib/gds_b.a -GDSLIB_LINK= -L$(OBJS)/jrd -lgds_b -#LINK_OPTS= -F$(FW_PATH) -framework $(FBFW_PREFIX) -#SS_LINK_OPTS= -F$(FW_PATH) -GPRE_BOOT_LINK_OPTS= -PLATFORM_INSTALLER= darwin_installer -SUPER_PLATFORM_INSTALLER= super_darwin_installer -GDSSHR_DEST= $(OBJS)/firebird/lib/gds.dylib -GDSSHR= gds.dylib +#FUNCSHR= $(OBJS)/firebird/lib/gdsf.so +#GDS_LINK= $(OBJS)/jrd -lgds_b +#GDS_LINK= $(GDSSHR_LINK) + +#GDSLIB_BACKEND= $(OBJS)/firebird/lib/gds_b.a +#GDSLIB_LINK= -L$(OBJS)/jrd -lgds_b -lc -ldl -lcrypt + +#GDSSHR= libgds.so #LINUX_GDSSHR= $(GDSSHR) -GDSSHR_LINK= -F$(FW_PATH) -framework $(FBFW_PREFIX) -#GDSSHR_LINK= $(SHRLIB_DIR) -lgds_pyxis -#PIPE_GDSSHR= $(OBJS)/firebird/lib/gds.so.0 -#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds_pyxis -PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -HLPDIR= $(SOURCE)/qli/ -HOSTNAME= `hostname | cut -d'.' -f1` -INCLUDES= include_so include_so_ada include_darwin -INTL= intl +#GDSSHR_LINK= $(SHRLIB_DIR) -lgds -ldl -lcrypt -INTL_CFLAGS= -bundle $(CFLAGS) -INTL_LD_LINE= cc -bundle -o gdsintl -F$(OBJS)/firebird -framework $(FBFW_PREFIX) -INTL_PIC_FLAGS= -bundle $(PIC_FLAGS) -INTL_TARGET= intl_shr_objs -IO_OBJECTS= unix.o -IO_P_OBJECTS= unix.bin -JRD_MISC_OBJECTS= -JRD_J_MISC_OBJECTS= -#JRD_P_MISC_OBJECTS= $(OBJS)/jrd/nodebug.bin -JRD_P_MISC_OBJECTS= -LANG_OBJECTS= ada.o ftn.o cob.o -LANGUAGES= cc cxx ada microfocus_cob make16 gdl1 -LD_LIBS= -lcc_dynamic -LD_LIBS_J= -LD_OPTS= -dylib -LOCK_JRD_MISC= -LOCK_MANAGER= -MARION_DB= -d source/marion.gdb -MUISQL= muisql +#PIPE_GDSSHR= source/interbase/lib/gds.so.0 +#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds + + +#HLPDIR= source/qli/ +#HOSTNAME= `hostname | cut -d'.' -f1` +INCLUDES= include_so include_so_ada + +INTL= +#INTL= intl + + +IO_Sources= unix.cpp + +#LANG_OBJECTS= ada.o ftn.o cob.o +#LANGUAGES= cc cxx ada microfocus_cob make16 gdl1 +LD_LIBS= -lc +LD_LIBS_J= -lc +LD_OPTS= -shared + + +#LOCK_JRD_MISC= +#LOCK_JRD_MISC= source/jrd/thd.o +#LOCK_MANAGER= manager + + +# In building the test kit may need to look at this +#MUISQL= muisql #MUISQL_MU_LIB= -L /usr/gds.$(HOSTNAME)/qa_tools/lib -lmu -MUISQL_MU_LIB= -L /usr/gds.$(HOSTNAME)/qa_tools/lib -lmu -MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -PIC_FLAGS= $(CFLAGS) -dynamic -fno-common +#MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm + + +PIC_FLAGS= $(CFLAGS) -fPIC PIPE= gds.a gds_pipe + + + REG_HELP= isc_ins_hlp.dat REMOTE_GDSSHR= $(GDSSHR) REMOTE_GDSSHR_LINK= $(SERVER_LINK) -REMOTE_P_OBJS= rem_p_objects -SCREEN_LIBS= + + SERVER_LINK= $(GDSSHR_LINK) -SETUP_ISC= ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD; -#SPECIAL_OPT= $(SOURCE)/special_opt -SPECIAL_OPT= -NETWORK_LIB= -SOCKET_LIB= + + + +SOCKET_LIB= -lc THREAD_LIB= -lpthread -SUN_FUNCSHR= $(FUNCSHR) -DARWIN_SUPER_GDSSHR= $(OBJS)/firebird/lib/gds.dylib.1 -SUPER_CLIENT_GDSSHR= $(DARWIN_SUPER_GDSSHR) -SUPER_BACKEND= $(OBJS)/jrd/gds_ss.a -SUPER_LINK= -L$(OBJS)/jrd -lgds_ss -framework System -framework Foundation + + +LX_SUPER_GDSSHR= source/interbase/lib/gds.so.1 +SUPER_CLIENT_GDSSHR= $(LX_SUPER_GDSSHR) +SUPER_BACKEND= source/jrd/gds_ss.a +SUPER_LINK= -Lsource/jrd -lgds_ss -lc -ldl -lcrypt -lpthread SUPER_SERVER= + UTILITIES= -WAL_P_OBJS= wal_p_objects - -SU_EXEC= $(SOURCE)/su_exec.sh - - -SUPER_SERVER_DEST= $(OBJS)/firebird/bin/ibserver -INET_SERVER_DEST= $(OBJS)/firebird/bin/gds_inet_server -DNET_SERVER_DEST= $(OBJS)/firebird/bin/gds_dnet_server -AMBX_SERVER_DEST= $(OBJS)/firebird/bin/gds_server -INET_LIB_DEST= $(OBJS)/firebird/lib/gds_inet_server.a -DNET_LIB_DEST= $(OBJS)/firebird/lib/gds_dnet_server.a - - -MSG_INSTALL_CMD= $(CP) $(OBJS)/firebird/interbase.msg $(FB_FRAMEWORK)/Resources/English.lproj -CARBONCORE_DIR_FLAG= -F/System/Library/Frameworks/CoreServices.framework/Frameworks -DARWIN_COREFOUNDATION_LINK= -framework CoreFoundation -DARWIN_FOUNDATION_LINK= -framework Foundation - -# Options for linking the FB shared library. -LIBGDS_SO := $(LIB)/libgds.dylib -LIB_LINK := libtool -LIBGDS_LINK_OPTIONS := -dynamic -install_name \ - $(FW_NAME)/Versions/A/$(FBFW_PREFIX) \ - -current_version $(FW_VERS) \ - -compatibility_version $(FW_COMPAT_VERS) \ - -framework System -framework CoreFoundation \ - -lstdc++ -lcc_dynamic - -LIB_LINK_OPTIONS := -dynamic - -# The routines used for IO. Darwin uses the unix routines. -IO_Sources= unix.cpp - -# Add in the platform specific link options -LINK_LIBS := $(DARWIN_COREFOUNDATION_LINK) -STATICLINK_LIBS := $(LINK_LIBS) -LINK_OPTS := $(DARWIN_COREFOUNDATION_LINK) - - -# We need to over ride some of the defaults set in make.defaults -AR= ar cru - -# Define our own rules to over ride those in make.rules -CFLAGS := -I/Users/john/Desktop/STLport-1115/stlport $(CARBONCORE_DIR_FLAG) $(CFLAGS) - -# If we don't define CXXFLAGS again, our changes to CFLAGS won't take effect -# for CXXFLAGS -CXXFLAGS:= $(CXXFLAGS) $(CFLAGS) - - -# Set up the link line to work with the framework. -ifdef UseSharedLibraries - LIBGDS_LINK = -F$(FIREBIRD) -framework $(FBFW_PREFIX) -endif - - -# Set DYLD_FRAMEWORK_PATH to point to the framework we are building. - -export DYLD_FRAMEWORK_PATH -DYLD_FRAMEWORK_PATH := $(FIREBIRD) -# The target to generate our psuedo framework for use when compiling. -../gen/firebird/lib/stub.dylib: - cc -c -o ../gen/firebird/lib/stub.o ../macosx_build/firebird_test/stub.c - libtool -dynamic -o ../gen/firebird/lib/stub.dylib -install_name Firebird2.framework/Versions/A/Firebird2 ../gen/firebird/lib/stub.o -firebird: darwin_pseudo_fw -darwin_pseudo_fw: ../gen/firebird/lib/stub.dylib - $(RM) -rf $(FB_FRAMEWORK) - mkdir -p $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var - ln -s Versions/Current/$(FBFW_PREFIX) $(FB_FRAMEWORK)/$(FBFW_PREFIX) - ln -s Versions/Current/Resources $(FB_FRAMEWORK)/Resources - ln -s Versions/Current/Headers $(FB_FRAMEWORK)/Headers - ln -s A $(FB_FRAMEWORK)/Versions/Current - sed "s/__VERSION__/0.0.boot/g" $(SRC_ROOT)/install/arch-specific/darwin/FrameworkInfo.plist > $(FB_FRAMEWORK)/Resources/Info.plist - ln -s ../../../include $(FB_FRAMEWORK)/Versions/A/Headers - ln -s ../../../lib/stub.dylib $(FB_FRAMEWORK)/Versions/A/$(FBFW_PREFIX) - ln -s ../../../../../../interbase.msg \ - $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/interbase.msg - ln -s ../../../../../../bin \ - $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/bin - ln -s ../../../../../../intl \ - $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/intl - ln -s ../../../../../../isc4.gdb \ - $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/isc4.gdb - ln -s ../../../../../../help \ - $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/help +# End of file prefix.linux: $(VERSION) $(PLATFORM) -# End of file prefix.darwin: $(VERSION) $(PLATFORM) + +#-------------------------------- + +# Some other things. +# For solaris and gbak +#LINK_LIBS += -lnsl diff --git a/src/make.rules b/src/make.rules index 18a8159ebe..b96443fa7c 100644 --- a/src/make.rules +++ b/src/make.rules @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: make.rules,v 1.1 2001-12-24 02:50:47 tamlin Exp $ +# $Id: make.rules,v 1.2 2002-01-04 11:34:13 skywalker Exp $ # #____________________________________________________________________________ @@ -59,7 +59,11 @@ BIN=$(GEN_ROOT)/firebird/bin # This picks up the current directory and maps it to the equivalent module # in the src and gen area. -ModuleName:=$(notdir $(CURDIR)) +RealSrcRootPath = $(shell cd $(SRC_ROOT); pwd) + +#ModuleName:=$(notdir $(CURDIR)) +ModuleName:=$(subst $(RealSrcRootPath)/,,$(CURDIR)) + SRC=$(SRC_ROOT)/$(ModuleName) OBJ=$(GEN_ROOT)/$(ModuleName) DEP=$(OBJ) @@ -83,10 +87,10 @@ CFLAGS:= $(CFLAGS) -g -pipe -MMD -p -fPIC -Wall -I$(ROOT)/src -I$(ROOT)/src/incl CXXFLAGS:= $(CXXFLAGS) $(CFLAGS) -#CC = libtool cc +#CC = libtool gcc #CXX = libtool c++ -CC = cc +CC = gcc CXX = c++ @@ -111,12 +115,12 @@ CXX = c++ ifdef UseLibToolForLink - LIB_LINK= libtool cc - STATICLIB_LINK = libtool cc -all-static + LIB_LINK= libtool gcc + STATICLIB_LINK = libtool gcc -all-static LIB_LINK_OPTIONS = -version-info 0:0:0 -release 1.5.0.0 -rpath /usr/lib - EXE_LINK = libtool cc - STATICEXE_LINK = libtool cc -all-static + EXE_LINK = libtool gcc + STATICEXE_LINK = libtool gcc -all-static else LIB_LINK= g++ -shared diff --git a/src/make.shared.variables b/src/make.shared.variables index 1eec1a015e..190bc2e93a 100644 --- a/src/make.shared.variables +++ b/src/make.shared.variables @@ -23,7 +23,7 @@ JRD_Sources= ail.cpp all.cpp alt.cpp bookmark.cpp blb.cpp blob_filter.cpp btr.cp event.cpp evl.cpp exe.cpp ext.cpp filters.cpp flu.cpp fun.cpp functions.cpp \ gds.cpp grant.cpp idx.cpp inf.cpp ini.cpp intl.cpp inuse.cpp \ isc.cpp isc_file.cpp isc_ipc.cpp isc_sync.cpp \ - jrd.cpp jrn.cpp lck.cpp llio.cpp log.cpp met.cpp memory_pool.cpp \ + jrd.cpp jrn.cpp lck.cpp llio.cpp log.cpp met.cpp \ misc.cpp mov.cpp nav.cpp old.cpp opt.cpp pag.cpp par.cpp pcmet.cpp \ perf.cpp pwd.cpp rec.cpp rlck.cpp \ rng.cpp rse.cpp sbm.cpp sch.cpp scl.cpp \ @@ -139,6 +139,15 @@ FBUTIL_Objects = $(FBUTIL_Sources:%.cpp=$(GEN_ROOT)/fbutil/%.o) FBUTIL_SharedObjects = $(FBUTIL_Objects:.o=.lo) +#________________________________________________________________________ +# +# common/memory + +FBMemory_Sources=allocators.cpp memory_pool.cpp + +FBMemory_Objects = $(FBMemory_Sources:%.cpp=$(GEN_ROOT)/common/memory/%.o) +FBMemory_SharedObjects = $(FB_Objects:.o=.lo) + #________________________________________________________________________ @@ -155,7 +164,8 @@ GDSLIB_Objects = $(JRD_Objects) \ $(WAL_Objects) \ $(GPRELIB_Objects) \ $(SECURITY_Objects) \ - $(FBUTIL_Objects) + $(FBUTIL_Objects) \ + $(FBMemory_Objects) # Notice that $(SECURITY_Objects) are missing, because that file can't be # compiled until later in the build process. @@ -167,4 +177,5 @@ BOOT_GDSLIB_Objects = $(JRD_Objects) \ $(PIPE_Objects) \ $(WAL_Objects) \ $(GPRELIB_Objects) \ - $(FBUTIL_Objects) + $(FBUTIL_Objects) \ + $(FBMemory_Objects) diff --git a/src/qli/eval.cpp b/src/qli/eval.cpp index a18e4174b0..f35d1b6c1b 100644 --- a/src/qli/eval.cpp +++ b/src/qli/eval.cpp @@ -41,6 +41,9 @@ #include "../jrd/gds_proto.h" #include "../jrd/utl_proto.h" +typedef vary VARY; + + extern USHORT QLI_prompt_count, QLI_reprompt; extern USHORT sw_forms; diff --git a/src/qli/exe.cpp b/src/qli/exe.cpp index 718ee1b813..f9bfb59c81 100644 --- a/src/qli/exe.cpp +++ b/src/qli/exe.cpp @@ -40,6 +40,7 @@ #include "../jrd/gds_proto.h" #include "../jrd/utl_proto.h" + #ifdef HAVE_UNISTD_H #include #endif @@ -54,6 +55,8 @@ #define FOPEN_WRITE_TYPE "w" #endif +typedef vary VARY; + extern jmp_buf QLI_env; extern USHORT QLI_prompt_count, QLI_reprompt; diff --git a/src/qli/mov.cpp b/src/qli/mov.cpp index d8bd6f2bbc..7b665671e7 100644 --- a/src/qli/mov.cpp +++ b/src/qli/mov.cpp @@ -70,6 +70,9 @@ static TEXT *type_name(USHORT); #endif +typedef vary VARY; + + #define LETTER(c) (c >= 'A' && c <= 'Z') #define DIGIT(c) (c >= '0' && c <= '9') #define TODAY "TODAY" diff --git a/src/remote/allr.cpp b/src/remote/allr.cpp index 8e3a7f0f01..c6b0f03ef5 100644 --- a/src/remote/allr.cpp +++ b/src/remote/allr.cpp @@ -40,22 +40,22 @@ static const struct USHORT typ_tail_length; } REM_block_sizes[] = { - type_MIN , 0, 0, - type_vec , sizeof(vec) , sizeof(((VEC) 0)->vec_object[0]), - type_rdb , sizeof(rdb) , 0, - type_fmt , sizeof(fmt) , sizeof(((FMT) 0)->fmt_desc[0]), - type_rrq , sizeof(rrq) , sizeof(((RRQ) 0)->rrq_rpt [0]), - type_rtr , sizeof(rtr) , 0, - type_str , sizeof(str) , 1, // random string block - type_rbl , sizeof(rbl) , 1, - type_port , sizeof(port) , 1, - type_msg , sizeof(message) , 1, - type_rsr , sizeof(rsr) , 0, - type_rvnt , sizeof(rvnt) , 0, - type_rpr , sizeof(rpr) , 0, - type_rmtque , sizeof(rmtque) , 0, + {type_MIN , 0, 0}, + {type_vec , sizeof(vec) , sizeof(((VEC) 0)->vec_object[0])}, + {type_rdb , sizeof(rdb) , 0}, + {type_fmt , sizeof(fmt) , sizeof(((FMT) 0)->fmt_desc[0])}, + {type_rrq , sizeof(rrq) , sizeof(((RRQ) 0)->rrq_rpt [0])}, + {type_rtr , sizeof(rtr) , 0}, + {type_str , sizeof(str) , 1}, // random string block + {type_rbl , sizeof(rbl) , 1}, + {type_port , sizeof(port) , 1}, + {type_msg , sizeof(message) , 1}, + {type_rsr , sizeof(rsr) , 0}, + {type_rvnt , sizeof(rvnt) , 0}, + {type_rpr , sizeof(rpr) , 0}, + {type_rmtque , sizeof(rmtque) , 0}, - type_MIN, 0, 0, + {type_MIN, 0, 0} }; diff --git a/src/remote/inet.cpp b/src/remote/inet.cpp index 76cac9ec99..daf02d89fd 100644 --- a/src/remote/inet.cpp +++ b/src/remote/inet.cpp @@ -23,7 +23,7 @@ * FSG 16.03.2001 */ /* -$Id: inet.cpp,v 1.4 2001-12-24 02:50:53 tamlin Exp $ +$Id: inet.cpp,v 1.5 2002-01-04 11:34:16 skywalker Exp $ */ #include "firebird.h" #include "../jrd/ib_stdio.h" @@ -44,10 +44,12 @@ $Id: inet.cpp,v 1.4 2001-12-24 02:50:53 tamlin Exp $ #include #endif + #ifdef HAVE_GRP_H #include #endif + #ifdef HAVE_SYS_TYPES_H #include #endif @@ -253,8 +255,8 @@ static BOOLEAN first_time = TRUE; static struct ipccfg INET_tcp_buffer[] = { - ISCCFG_REMOTE_BUFFER, 0, &INET_remote_buffer, 0, 0, - NULL, 0, NULL, 0, 0 + {ISCCFG_REMOTE_BUFFER, 0, &INET_remote_buffer, 0, 0}, + {NULL, 0, NULL, 0, 0} }; @@ -777,14 +779,14 @@ PORT INET_analyze( TEXT* file_name, static const p_cnct::p_cnct_repeat protocols_to_try1[] = { - PROTOCOL_VERSION8, arch_generic, ptype_rpc, MAX_PTYPE, 2, - PROTOCOL_VERSION8, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 3, - PROTOCOL_VERSION10, arch_generic, ptype_rpc, MAX_PTYPE, 4, - PROTOCOL_VERSION10, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 5 + {PROTOCOL_VERSION8, arch_generic, ptype_rpc, MAX_PTYPE, 2}, + {PROTOCOL_VERSION8, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 3}, + {PROTOCOL_VERSION10, arch_generic, ptype_rpc, MAX_PTYPE, 4}, + {PROTOCOL_VERSION10, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 5} #ifdef SCROLLABLE_CURSORS , - PROTOCOL_SCROLLABLE_CURSORS, arch_generic, ptype_rpc, MAX_PTYPE, 6, - PROTOCOL_SCROLLABLE_CURSORS, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 7 + {PROTOCOL_SCROLLABLE_CURSORS, arch_generic, ptype_rpc, MAX_PTYPE, 6}, + {PROTOCOL_SCROLLABLE_CURSORS, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 7} #endif }; @@ -819,10 +821,10 @@ PORT INET_analyze( TEXT* file_name, static const p_cnct::p_cnct_repeat protocols_to_try2[] = { - PROTOCOL_VERSION6, arch_generic, ptype_rpc, ptype_batch_send, 2, - PROTOCOL_VERSION6, ARCHITECTURE, ptype_rpc, ptype_batch_send, 3, - PROTOCOL_VERSION7, arch_generic, ptype_rpc, MAX_PTYPE, 4, - PROTOCOL_VERSION7, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 5 + {PROTOCOL_VERSION6, arch_generic, ptype_rpc, ptype_batch_send, 2}, + {PROTOCOL_VERSION6, ARCHITECTURE, ptype_rpc, ptype_batch_send, 3}, + {PROTOCOL_VERSION7, arch_generic, ptype_rpc, MAX_PTYPE, 4}, + {PROTOCOL_VERSION7, ARCHITECTURE, ptype_rpc, MAX_PTYPE, 5} }; cnct->p_cnct_count = INET_PRIVATE_COUNTOF(protocols_to_try2); @@ -848,10 +850,10 @@ PORT INET_analyze( TEXT* file_name, static const p_cnct::p_cnct_repeat protocols_to_try3[] = { - PROTOCOL_VERSION3, arch_generic, ptype_rpc, ptype_batch_send, 2, - PROTOCOL_VERSION3, ARCHITECTURE, ptype_rpc, ptype_batch_send, 3, - PROTOCOL_VERSION4, arch_generic, ptype_rpc, ptype_batch_send, 4, - PROTOCOL_VERSION4, ARCHITECTURE, ptype_rpc, ptype_batch_send, 5 + {PROTOCOL_VERSION3, arch_generic, ptype_rpc, ptype_batch_send, 2}, + {PROTOCOL_VERSION3, ARCHITECTURE, ptype_rpc, ptype_batch_send, 3}, + {PROTOCOL_VERSION4, arch_generic, ptype_rpc, ptype_batch_send, 4}, + {PROTOCOL_VERSION4, ARCHITECTURE, ptype_rpc, ptype_batch_send, 5} }; cnct->p_cnct_count = INET_PRIVATE_COUNTOF(protocols_to_try3); diff --git a/src/remote/remote.cpp b/src/remote/remote.cpp index dfc6b5ec04..abc0d7feef 100644 --- a/src/remote/remote.cpp +++ b/src/remote/remote.cpp @@ -53,9 +53,9 @@ static SLONG dummy_interval = DUMMY_INTERVAL; #define DUMMY_PACKET_INTRVL_IDX 1 static struct ipccfg INET_cfgtbl[] = { - ISCCFG_CONN_TIMEOUT, 0, &conn_timeout, 0, 0, - ISCCFG_DUMMY_INTRVL, 0, &dummy_interval, 0, 0, - NULL, 0, NULL, 0, 0 + {ISCCFG_CONN_TIMEOUT, 0, &conn_timeout, 0, 0}, + {ISCCFG_DUMMY_INTRVL, 0, &dummy_interval, 0, 0}, + {NULL, 0, NULL, 0, 0} }; static void cleanup_memory(void *); diff --git a/src/utilities/drop.cpp b/src/utilities/drop.cpp index e61b71bb86..66771b21e1 100644 --- a/src/utilities/drop.cpp +++ b/src/utilities/drop.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: drop.cpp,v 1.4 2001-12-24 02:50:53 tamlin Exp $ +$Id: drop.cpp,v 1.5 2002-01-04 11:34:16 skywalker Exp $ */ #include "firebird.h" @@ -76,16 +76,16 @@ static SCHAR **orig_argv; static struct ipccfg config_table[] = { #ifndef MMAP_SUPPORTED - "V4_LOCK_MEM_SIZE", -1, &LOCK_shm_size, 0, 0, - "ANY_LOCK_MEM_SIZE", -1, &LOCK_shm_size, -1, 0, - "V4_EVENT_MEM_SIZE", -1, &EVENT_default_size, 0, 0, - "ANY_EVENT_MEM_SIZE", -1, &EVENT_default_size, -1, 0, + {"V4_LOCK_MEM_SIZE", -1, &LOCK_shm_size, 0, 0}, + {"ANY_LOCK_MEM_SIZE", -1, &LOCK_shm_size, -1, 0}, + {"V4_EVENT_MEM_SIZE", -1, &EVENT_default_size, 0, 0}, + {"ANY_EVENT_MEM_SIZE", -1, &EVENT_default_size, -1, 0}, #endif #ifndef NO_SEMAPHORES - "V4_LOCK_SEM_COUNT", -1, &LOCK_sem_count, 0, 0, - "ANY_LOCK_SEM_COUNT", -1, &LOCK_sem_count, -1, 0, + {"V4_LOCK_SEM_COUNT", -1, &LOCK_sem_count, 0, 0}, + {"ANY_LOCK_SEM_COUNT", -1, &LOCK_sem_count, -1, 0}, #endif - NULL, -1, NULL, 0, 0 + {NULL, -1, NULL, 0, 0} }; diff --git a/src/utilities/dropv3.cpp b/src/utilities/dropv3.cpp index cf0cb968f4..421e99e558 100644 --- a/src/utilities/dropv3.cpp +++ b/src/utilities/dropv3.cpp @@ -63,11 +63,14 @@ static struct { int *vptr; } LOCK_hdrtbl[] = { #ifndef MMAP_SUPPORTED - "SHMSIZE", &LOCK_shm_size, + {"SHMSIZE", &LOCK_shm_size}, #else - "SEMKEY", &LOCK_sem_key, "BLKSIG", &LOCK_blk_signal, + {"SEMKEY", &LOCK_sem_key}, + {"BLKSIG", &LOCK_blk_signal}, #endif -"SEMCOUNT", &LOCK_sem_count, NULL, NULL}; + {"SEMCOUNT", &LOCK_sem_count}, + {NULL, NULL} +}; int V3_drop(int argc, UCHAR **argv) diff --git a/src/v5_examples/empddl.sql b/src/v5_examples/empddl.sql index a22e3ffae4..185cacd7d6 100644 --- a/src/v5_examples/empddl.sql +++ b/src/v5_examples/empddl.sql @@ -29,6 +29,8 @@ /* * Define domains. */ +/* set echo on; +*/ CREATE DOMAIN firstname AS VARCHAR(15);