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:
asfernandes 2010-04-07 02:04:22 +00:00
parent e5c4a8826b
commit f9154aca75
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/Collation.cpp
View File

@ -863,7 +863,6 @@ Collation* Collation::createInstance(MemoryPool& pool, TTYPE_ID id, texttype* tt
return NULL; // compiler silencer
}
void Collation::release()
{
fb_assert(useCount >= 0);
@ -883,7 +882,6 @@ void Collation::release()
}
}
void Collation::destroy()
{
fb_assert(useCount == 0);
@ -899,7 +897,6 @@ void Collation::destroy()
existenceLock = NULL;
}
void Collation::incUseCount(thread_db* /*tdbb*/)
{
fb_assert(!obsolete);
@ -908,7 +905,6 @@ void Collation::incUseCount(thread_db* /*tdbb*/)
++useCount;
}
void Collation::decUseCount(thread_db* tdbb)
{
fb_assert(useCount >= 0);

2
src/jrd/cch.cpp
View File

@ -2784,7 +2784,7 @@ static THREAD_ENTRY_DECLARE cache_reader(THREAD_ENTRY_PARAM arg)
// LCK_init fails we won't be able to accomplish anything anyway, so
// return, unlike the other try blocks further down the page.
BufferControl* bcb = 0;
BufferControl* bcb = NULL;
try {

8
src/jrd/evl.cpp
View File

@ -829,8 +829,8 @@ dsc* EVL_expr(thread_db* tdbb, jrd_nod* const node)
const Format* format = (Format*) message->nod_arg[e_msg_format];
desc = &format->fmt_desc[(int)(IPTR) node->nod_arg[e_arg_number]];
impure->vlu_desc.dsc_address = (UCHAR *) request +
message->nod_impure + (IPTR) desc->dsc_address;
impure->vlu_desc.dsc_address = request->getImpure<UCHAR>(
message->nod_impure + (IPTR) desc->dsc_address);
impure->vlu_desc.dsc_dtype = desc->dsc_dtype;
impure->vlu_desc.dsc_length = desc->dsc_length;
impure->vlu_desc.dsc_scale = desc->dsc_scale;
@ -839,7 +839,7 @@ dsc* EVL_expr(thread_db* tdbb, jrd_nod* const node)
if (impure->vlu_desc.dsc_dtype == dtype_text)
INTL_adjust_text_descriptor(tdbb, &impure->vlu_desc);
USHORT* impure_flags = (USHORT*) ((UCHAR *) request +
USHORT* impure_flags = request->getImpure<USHORT>(
(IPTR) message->nod_arg[e_msg_impure_flags] +
(sizeof(USHORT) * (IPTR) node->nod_arg[e_arg_number]));
@ -3495,7 +3495,7 @@ static dsc* record_version(thread_db* tdbb, const jrd_nod* node, impure_value* i
// Initialize descriptor
impure->vlu_misc.vlu_long = rpb->rpb_transaction_nr;
impure->vlu_desc.dsc_address = (UCHAR *) &impure->vlu_misc.vlu_long;
impure->vlu_desc.dsc_address = (UCHAR*) &impure->vlu_misc.vlu_long;
impure->vlu_desc.dsc_dtype = dtype_text;
impure->vlu_desc.dsc_length = 4;
impure->vlu_desc.dsc_ttype() = ttype_binary;

8
src/jrd/ini.epp
View File

@ -863,12 +863,12 @@ static void add_index_set(thread_db* tdbb)
END_STORE;
}
if (handle1) {
if (handle1)
CMP_release(tdbb, handle1);
}
if (handle2) {
if (handle2)
CMP_release(tdbb, handle2);
}
}