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

Changes to make it compile on linux.

Browse Source 
and work through a few issues.
This commit is contained in:
skywalker 2002-01-04 11:34:22 +00:00
parent d0a8f6abb8
commit a887af3646
70 changed files with 1305 additions and 1228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/alice/alice.cpp
View File

@ -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) {

32
src/burp/backup.epp
View File

@ -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[] =

58
src/burp/restore.epp
View File

@ -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 *);

4
src/common/memory/allocators.cpp
View File

@ -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();

9
src/common/memory/allocators.h
View File

@ -115,16 +115,21 @@ namespace Firebird
template <class _Tp1> struct rebind {
typedef Firebird::allocator<_Tp1> other;
};
bool operator==(const allocator<T>& rhs)
bool operator==(const allocator<T>& rhs) const
{
return pool == rhs.pool && type == rhs.type;
}
private:
MemoryPool *pool;
SSHORT type;
};
};
#endif // COMMON_ALLOCATORS_H

10
src/dsql/pass1.cpp
View File

@ -23,6 +23,7 @@
#include "firebird.h"
#include <string.h>
#include <memory>
#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<nod> 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);
}
}
}

26
src/dsql/preparse.cpp
View File

@ -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 */

4
src/gpre/ada.cpp
View File

@ -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);

5
src/gpre/c_cxx.cpp
View File

@ -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);

3
src/gpre/cmp.cpp
View File

@ -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);

6
src/gpre/exp.cpp
View File

@ -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);

4
src/gpre/ftn.cpp
View File

@ -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);

21
src/gpre/gpre.cpp
View File

@ -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;
}

21
src/gpre/gpre.h
View File

@ -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,

6
src/gpre/gpre_meta_boot.cpp
View File

@ -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, ...)
{
}
}
}

11
src/gpre/par.cpp
View File

@ -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);

4
src/gpre/pat.cpp
View File

@ -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 = "";
}

8
src/include/fb_exception.h
View File

@ -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!

8
src/include/gen/codes.h
View File

@ -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 */

1386
src/include/gen/codetext.h
View File

File diff suppressed because it is too large Load Diff

2
src/include/gen/gds_codes.ftn
View File

@ -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 --

2
src/include/gen/gds_codes.pas
View File

@ -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
*)
(*
*

12
src/include/gen/iberror.h
View File

@ -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 */

6
src/include/gen/msg_facs.h
View File

@ -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 "},

2
src/include/gen/msgs.h
View File

@ -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
*/
/*
*

2
src/include/gen/rdb_codes.h
View File

@ -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
*/
/*
*

2
src/include/gen/sql_code.h
View File

@ -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
*/
/*
*

2
src/jrd/alt_use_sec.h
View File

@ -29,7 +29,7 @@
* John Bellardo <bellardo@cs.ucsd.edu>
*
*
* $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 $
*
*/

4
src/jrd/builtin.cpp
View File

@ -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

5
src/jrd/cmp.cpp
View File

@ -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;

58
src/jrd/codes.epp
View File

@ -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 */

5
src/jrd/dfw.epp
View File

@ -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;

11
src/jrd/dpm.epp
View File

@ -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 */

6
src/jrd/event.cpp
View File

@ -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}
};

4
src/jrd/functions.cpp
View File

@ -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

7
src/jrd/gds.cpp
View File

@ -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;
}
}
}

2
src/jrd/ini.epp
View File

@ -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;
}

67
src/jrd/isc.cpp
View File

@ -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;

3
src/jrd/jrd.h
View File

@ -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); }

9
src/jrd/met.epp
View File

@ -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;

5
src/jrd/opt.cpp
View File

@ -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;

6
src/jrd/par.cpp
View File

@ -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;

4
src/jrd/perf.cpp
View File

@ -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

12
src/jrd/sbm.cpp
View File

@ -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++) {

2
src/jrd/scl.epp
View File

@ -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*>(str_buffer), length);
str::extend(const_cast<str*&>(str_buffer), length);
buffer = (TEXT*) str_buffer->str_data;
acl = buffer + old_offset;
}

40
src/jrd/svc.cpp
View File

@ -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<PFN_SERV_t>(MAIN_GBAK), 0,
isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", reinterpret_cast<PFN_SERV_t>(MAIN_GBAK), 0,
isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", reinterpret_cast<PFN_SERV_t>(MAIN_GFIX), 0,
isc_action_svc_add_user, "Add User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0,
isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0,
isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0,
isc_action_svc_display_user, "Display User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0,
isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", reinterpret_cast<PFN_SERV_t>(MAIN_GFIX), 0,
isc_action_svc_lock_stats, "Lock Stats", NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0,
isc_action_svc_db_stats, "Database Stats", NULL, NULL, reinterpret_cast<PFN_SERV_t>(MAIN_GSTAT), 0,
isc_action_svc_get_ib_log, "Get Log File", NULL, NULL, reinterpret_cast<PFN_SERV_t>(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<PFN_SERV_t>(MAIN_GBAK), 0},
{isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", reinterpret_cast<PFN_SERV_t>(MAIN_GBAK), 0},
{isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", reinterpret_cast<PFN_SERV_t>(MAIN_GFIX), 0},
{isc_action_svc_add_user, "Add User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0},
{isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0},
{isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0},
{isc_action_svc_display_user, "Display User", NULL, "bin/gsec", reinterpret_cast<PFN_SERV_t>(MAIN_GSEC), 0},
{isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", reinterpret_cast<PFN_SERV_t>(MAIN_GFIX), 0},
{isc_action_svc_lock_stats, "Lock Stats", NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0},
{isc_action_svc_db_stats, "Database Stats", NULL, NULL, reinterpret_cast<PFN_SERV_t>(MAIN_GSTAT), 0},
{isc_action_svc_get_ib_log, "Get Log File", NULL, NULL, reinterpret_cast<PFN_SERV_t>(SVC_read_ib_log), 0},
/* actions with no names are undocumented */
isc_action_svc_set_config, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0,
isc_action_svc_default_config, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0,
isc_action_svc_set_env, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0,
isc_action_svc_set_env_lock, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0,
isc_action_svc_set_env_msg, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0,
{isc_action_svc_set_config, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0},
{isc_action_svc_default_config, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0},
{isc_action_svc_set_env, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0},
{isc_action_svc_set_env_lock, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0},
{isc_action_svc_set_env_msg, NULL, NULL, NULL, reinterpret_cast<PFN_SERV_t>(TEST_THREAD), 0},
#endif
0, NULL, NULL, NULL, NULL, 0
{0, NULL, NULL, NULL, NULL, 0}
};
#endif /* LINUX */

2
src/jrd/tra.cpp
View File

@ -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)

3
src/jrd/vio.cpp
View File

@ -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;

26
src/lock/lock.cpp
View File

@ -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)

4
src/make.defaults
View File

@ -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

78
src/make.new/Makefile.in.common.memory Executable file
View File

@ -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 <mark.odonohue@ludwig.edu.au>
#
# 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)

7
src/make.new/Makefile.in.firebird
View File

@ -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 $@

4
src/make.new/Makefile.in.gpre
View File

@ -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)

13
src/make.new/Makefile.in.jrd
View File

@ -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 $< $@

13
src/make.new/config/config.h.in
View File

@ -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

8
src/make.new/make.rules
View File

@ -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)

17
src/make.new/make.shared.variables
View File

@ -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)

9
src/make.new/prefix.linux
View File

@ -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

292
src/make.platform
View File

@ -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 <sys/ioctl.h>
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

20
src/make.rules
View File

@ -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

17
src/make.shared.variables
View File

@ -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)

3
src/qli/eval.cpp
View File

@ -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;

3
src/qli/exe.cpp
View File

@ -40,6 +40,7 @@
#include "../jrd/gds_proto.h"
#include "../jrd/utl_proto.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#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;

3
src/qli/mov.cpp
View File

@ -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"

30
src/remote/allr.cpp
View File

@ -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}
};

36
src/remote/inet.cpp
View File

@ -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 <sys/param.h>
#endif
#ifdef HAVE_GRP_H
#include <grp.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#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);

6
src/remote/remote.cpp
View File

@ -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 *);

16
src/utilities/drop.cpp
View File

@ -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}
};

9
src/utilities/dropv3.cpp
View File

@ -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)

2
src/v5_examples/empddl.sql
View File

@ -29,6 +29,8 @@
/*
* Define domains.
*/
/* set echo on;
*/
CREATE DOMAIN firstname AS VARCHAR(15);