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

Misc.

Browse Source
This commit is contained in:
robocop 2005-05-16 09:15:31 +00:00
parent b8e90d3896
commit 3f0b18df85
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/alice/alice.cpp
View File

@ -24,8 +24,6 @@
//
//____________________________________________________________
//
// $Id: alice.cpp,v 1.77 2005-05-16 09:00:13 robocop Exp $
//
// 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
// conditionals, as the engine now fully supports
// readonly databases.

5
src/jrd/evl.cpp
View File

@ -1316,8 +1316,9 @@ bool EVL_field(jrd_rel* relation, Record* record, USHORT id, dsc* desc)
desc->dsc_sub_type = 0;
desc->dsc_scale = 0;
INTL_ASSIGN_TTYPE(desc, ttype_metadata);
desc->dsc_address = (UCHAR*) relation->rel_owner_name.c_str();
desc->dsc_length = relation->rel_owner_name.length();
Firebird::MetaName& owner_name = relation->rel_owner_name;
desc->dsc_address = (UCHAR*) owner_name.c_str(); // throwing away const.
desc->dsc_length = owner_name.length();
}
else if (temp_nod_type == nod_current_role)
{

2
src/jrd/idx.cpp
View File

@ -773,7 +773,7 @@ IDX_E IDX_modify_check_constraints(thread_db* tdbb,
(tdbb, org_rpb->rpb_relation, transaction, &idx, &window))
{
if (!(idx.idx_flags & (idx_primary | idx_unique))
|| !MET_lookup_partner(tdbb, org_rpb->rpb_relation, &idx,0))
|| !MET_lookup_partner(tdbb, org_rpb->rpb_relation, &idx, 0))
{
continue;
}

9
src/jrd/opt.cpp
View File

@ -2328,13 +2328,14 @@ static bool dump_index(const jrd_nod* node,
MET_lookup_index(tdbb, index_name, retrieval->irb_relation->rel_name,
(USHORT) (retrieval->irb_index + 1));
*buffer_length -= 1 + index_name.length();
const SSHORT length = index_name.length();
*buffer_length -= 1 + length;
if (*buffer_length < 0) {
return false;
}
*buffer++ = (SCHAR) (index_name.length());
memcpy(buffer, index_name.c_str(), index_name.length());
buffer += index_name.length();
*buffer++ = (SCHAR) length;
memcpy(buffer, index_name.c_str(), length);
buffer += length;
}
*buffer_ptr = buffer;

2
src/jrd/rse.h
View File

@ -96,7 +96,7 @@ public:
ULONG rsb_record_count; // count of records returned from rsb (not candidate records processed)
RecordSource* rsb_next; // next rsb, if appropriate
jrd_rel* rsb_relation; // relation, if appropriate
VaryingString* rsb_alias; // SQL alias for relation
VaryingString* rsb_alias; // SQL alias for relation
jrd_prc* rsb_procedure; // procedure, if appropriate
Format* rsb_format; // format, if appropriate
jrd_nod* rsb_any_boolean; // any/all boolean

5
src/jrd/sym.h
View File

@ -44,15 +44,14 @@ public:
blr, /* BLR request cache block */
label /* CVC: I need to track labels if LEAVE is implemented. */
};
typedef sym_t SYM_T;
Firebird::MetaName sym_string; // symbol value
SYM_T sym_type; /* symbol type */
sym_t sym_type; /* symbol type */
BLK sym_object; /* general pointer to object */
Symbol* sym_homonym; /* homonym pointer */
public:
explicit Symbol(MemoryPool& p, const Firebird::MetaName& val,
SYM_T type, BLK object)
sym_t type, BLK object)
: sym_collision(0), sym_string(p, val), sym_type(type),
sym_object(object), sym_homonym(0) { }
void insert();