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

Misc

Browse Source
This commit is contained in:
asfernandes 2009-04-04 16:28:33 +00:00
parent b2546988de
commit 9e0c4f06f2
10 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/sql.extensions/README.global_temporary_tables
View File

@ -74,4 +74,4 @@ Writes = OFF" setting despite of database setting.
There's no limit on number of GTT instances. If you have N transactions
active simultaneously and each transaction has referenced some GTT then you'll
have N GTT's instances.
have N GTTs instances.

2
src/jrd/err_proto.h
View File

@ -43,8 +43,8 @@ enum idx_e {
idx_e_foreign_references_present
};
class jrd_rel;
} //namespace Jrd
bool ERR_post_warning(const Firebird::Arg::StatusVector& v);

1
src/jrd/exe.h
View File

@ -71,7 +71,6 @@ enum nod_t {
#undef NODE
};
class jrd_rel;
class jrd_nod;
struct sort_key_def;

12
src/jrd/file_params.h
View File

@ -59,15 +59,15 @@ static const char* const SEM_FILE = "fb_sem";
/* keep MSG_FILE_LANG in sync with build_file.epp */
#ifdef WIN_NT
static const char* const WORKFILE = "c:\\temp\\";
static const char MSG_FILE_LANG[]= "intl\\%.10s.msg";
static const char* const WORKFILE = "c:\\temp\\";
static const char MSG_FILE_LANG[] = "intl\\%.10s.msg";
#else
static const char* const WORKFILE = "/tmp/";
static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
static const char* const WORKFILE = "/tmp/";
static const char MSG_FILE_LANG[] = "intl/%.10s.msg";
#endif
static const char* const LOGFILE = "firebird.log";
static const char* const MSG_FILE = "firebird.msg";
static const char* const LOGFILE = "firebird.log";
static const char* const MSG_FILE = "firebird.msg";
// Keep in sync with MSG_FILE_LANG
const int LOCALE_MAX = 10;

20
src/jrd/isc_s_proto.h
View File

@ -48,14 +48,14 @@ int ISC_mutex_init(struct mtx*, const TEXT*);
int ISC_mutex_init(struct mtx*);
#endif
int ISC_mutex_lock(struct mtx *);
int ISC_mutex_lock_cond(struct mtx *);
int ISC_mutex_unlock(struct mtx *);
void ISC_mutex_fini(struct mtx *);
int ISC_mutex_lock(struct mtx*);
int ISC_mutex_lock_cond(struct mtx*);
int ISC_mutex_unlock(struct mtx*);
void ISC_mutex_fini(struct mtx*);
#if defined HAVE_MMAP || defined WIN_NT
UCHAR* ISC_map_object(ISC_STATUS *, sh_mem*, ULONG, ULONG);
void ISC_unmap_object(ISC_STATUS *, sh_mem*, UCHAR **, ULONG);
UCHAR* ISC_map_object(ISC_STATUS*, sh_mem*, ULONG, ULONG);
void ISC_unmap_object(ISC_STATUS*, sh_mem*, UCHAR**, ULONG);
#endif
#ifdef UNIX
@ -68,10 +68,10 @@ void ISC_sync_signals_reset();
ULONG ISC_exception_post(ULONG, const TEXT*);
#endif
UCHAR* ISC_remap_file(ISC_STATUS *, struct sh_mem *, ULONG, bool);
void ISC_reset_timer(FPTR_VOID_PTR, void *, SLONG *, void **);
void ISC_set_timer(SLONG, FPTR_VOID_PTR, void *, SLONG *, void **);
void ISC_unmap_file(ISC_STATUS *, struct sh_mem *);
UCHAR* ISC_remap_file(ISC_STATUS*, struct sh_mem*, ULONG, bool);
void ISC_reset_timer(FPTR_VOID_PTR, void*, SLONG*, void**);
void ISC_set_timer(SLONG, FPTR_VOID_PTR, void*, SLONG*, void**);
void ISC_unmap_file(ISC_STATUS*, struct sh_mem*);
#endif // JRD_ISC_S_PROTO_H

2
src/jrd/jrd_pwd.h
View File

@ -37,7 +37,7 @@
const size_t MAX_PASSWORD_ENC_LENGTH = 12; // passed by remote protocol
const size_t MAX_PASSWORD_LENGTH = 64; // used to store passwords internally
static const char* const PASSWORD_SALT = "9z"; // for old ENC_crypt()
static const char* const PASSWORD_SALT = "9z"; // for old ENC_crypt()
const size_t SALT_LENGTH = 12; // measured after base64 coding
namespace Jrd {

2
src/jrd/nav.cpp
View File

@ -937,7 +937,7 @@ static UCHAR* nav_open(
thread_db* tdbb,
RecordSource* rsb,
IRSB_NAV impure,
WIN * window, rse_get_mode direction, btree_exp** expanded_node)
WIN* window, rse_get_mode direction, btree_exp** expanded_node)
{
/**************************************
*

8
src/jrd/par.cpp
View File

@ -1820,7 +1820,7 @@ static jrd_nod* par_plan(thread_db* tdbb, CompilerScratch* csb)
if (node_type == blr_join || node_type == blr_merge) {
USHORT count = (USHORT) BLR_BYTE;
jrd_nod* plan = PAR_make_node(tdbb, count);
plan->nod_type = (nod_t) (USHORT) blr_table[node_type];
plan->nod_type = (nod_t)(USHORT) blr_table[node_type];
for (jrd_nod** arg = plan->nod_arg; count--;)
*arg++ = par_plan(tdbb, csb);
@ -1832,7 +1832,7 @@ static jrd_nod* par_plan(thread_db* tdbb, CompilerScratch* csb)
if (node_type == blr_retrieve)
{
jrd_nod* plan = PAR_make_node(tdbb, e_retrieve_length);
plan->nod_type = (nod_t) (USHORT) blr_table[node_type];
plan->nod_type = (nod_t)(USHORT) blr_table[node_type];
/* parse the relation name and context--the relation
itself is redundant except in the case of a view,
@ -3397,9 +3397,9 @@ jrd_nod* PAR_parse_node(thread_db* tdbb, CompilerScratch* csb, USHORT expected,
if (set_type)
{
if (csb->csb_g_flags & csb_blr_version4)
node->nod_type = (nod_t) (USHORT) blr_table4[(int) blr_operator];
node->nod_type = (nod_t)(USHORT) blr_table4[(int) blr_operator];
else
node->nod_type = (nod_t) (USHORT) blr_table[(int) blr_operator];
node->nod_type = (nod_t)(USHORT) blr_table[(int) blr_operator];
}
size_t pos = 0;

2
src/misc/codes.epp
View File

@ -89,7 +89,7 @@ const int FAC_SQL_POSITIVE = 14; // facility for positive SQL codes
const int FAC_SQL_NEGATIVE = 13; // ditto for negative codes
const int gds_facility_local = 20;
const int gds_base_local = (SLONG) gds_facility_local << 24;
const int gds_base_local = gds_facility_local << 24;
const int gds_factor_local = 1;

1
src/remote/inet_server.cpp
View File

@ -548,4 +548,3 @@ static int tryStopMainThread()
return serverClosing ? 1 : 0;
}
#endif