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

Misc: format

Browse Source
This commit is contained in:
robocop 2004-08-21 09:29:46 +00:00
parent ba64f7cd22
commit b60c0e4cab
8 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpre/jrdmet.cpp
View File

@ -26,7 +26,7 @@
// //
//____________________________________________________________ //____________________________________________________________
// //
// $Id: jrdmet.cpp,v 1.18 2004-06-03 07:31:10 robocop Exp $ // $Id: jrdmet.cpp,v 1.19 2004-08-21 09:21:08 robocop Exp $
// //
#include "firebird.h" #include "firebird.h"
@ -81,7 +81,8 @@ void JRDMET_init( DBB db)
field->fld_dtype = gfield->gfld_dtype; field->fld_dtype = gfield->gfld_dtype;
field->fld_sub_type = gfield->gfld_sub_type; field->fld_sub_type = gfield->gfld_sub_type;
if (field->fld_dtype == dtype_varying || if (field->fld_dtype == dtype_varying ||
field->fld_dtype == dtype_text) { field->fld_dtype == dtype_text)
{
field->fld_dtype = dtype_cstring; field->fld_dtype = dtype_cstring;
field->fld_flags |= FLD_text; field->fld_flags |= FLD_text;
++field->fld_length; ++field->fld_length;

6
src/jrd/err.cpp
View File

@ -409,7 +409,8 @@ void ERR_post_nothrow(ISC_STATUS status, ...)
va_start(args, status); va_start(args, status);
internal_post(status, args); internal_post(status, args);
}; }
void ERR_post(ISC_STATUS status, ...) void ERR_post(ISC_STATUS status, ...)
/************************************** /**************************************
@ -431,7 +432,8 @@ void ERR_post(ISC_STATUS status, ...)
DEBUG; DEBUG;
ERR_punt(); ERR_punt();
}; }
static void internal_post(ISC_STATUS status, va_list args) static void internal_post(ISC_STATUS status, va_list args)
{ {

4
src/jrd/evl.cpp
View File

@ -19,7 +19,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* $Id: evl.cpp,v 1.102 2004-08-17 17:52:18 dimitr Exp $ * $Id: evl.cpp,v 1.103 2004-08-21 09:29:45 robocop Exp $
*/ */
/* /*
@ -5084,7 +5084,7 @@ static dsc* internal_info(thread_db* tdbb, const dsc* value, impure_value* impur
**************************************/ **************************************/
EVL_make_value(tdbb, value, impure); EVL_make_value(tdbb, value, impure);
internal_info_id id = const internal_info_id id =
*reinterpret_cast<internal_info_id*>(impure->vlu_desc.dsc_address); *reinterpret_cast<internal_info_id*>(impure->vlu_desc.dsc_address);
switch (id) switch (id)

3
src/jrd/exe.cpp
View File

@ -1787,6 +1787,7 @@ static void stuff_stack_trace(const jrd_req* request)
ERR_post_nothrow(isc_random, isc_arg_string, ERR_cstring(sTrace), 0); ERR_post_nothrow(isc_random, isc_arg_string, ERR_cstring(sTrace), 0);
} }
static jrd_nod* looper(thread_db* tdbb, jrd_req* request, jrd_nod* in_node) static jrd_nod* looper(thread_db* tdbb, jrd_req* request, jrd_nod* in_node)
{ {
/************************************** /**************************************
@ -3233,7 +3234,7 @@ static void release_blobs(thread_db* tdbb, jrd_req* request)
/* Release blobs bound to this request */ /* Release blobs bound to this request */
if (request->req_blobs.getFirst()) do { if (request->req_blobs.getFirst()) do {
ULONG blob_temp_id = request->req_blobs.current(); const ULONG blob_temp_id = request->req_blobs.current();
if (transaction->tra_blobs.locate(blob_temp_id)) { if (transaction->tra_blobs.locate(blob_temp_id)) {
BlobIndex *current = &transaction->tra_blobs.current(); BlobIndex *current = &transaction->tra_blobs.current();
if (current->bli_materialized) if (current->bli_materialized)

11
src/jrd/opt.cpp
View File

@ -6385,6 +6385,7 @@ static jrd_nod* make_missing(thread_db* tdbb,
#ifdef EXPRESSION_INDICES #ifdef EXPRESSION_INDICES
if (idx->idx_flags & idx_expressn) if (idx->idx_flags & idx_expressn)
{ {
fb_assert(idx->idx_expression != NULL);
if (!expression_equal(tdbb, opt, idx, field, stream)) if (!expression_equal(tdbb, opt, idx, field, stream))
{ {
return NULL; return NULL;
@ -6470,6 +6471,7 @@ static jrd_nod* make_starts(thread_db* tdbb,
#ifdef EXPRESSION_INDICES #ifdef EXPRESSION_INDICES
if (idx->idx_flags & idx_expressn) if (idx->idx_flags & idx_expressn)
{ {
fb_assert(idx->idx_expression != NULL);
if (!(expression_equal(tdbb, opt, idx, field, stream) && if (!(expression_equal(tdbb, opt, idx, field, stream) &&
computable(opt->opt_csb, value, stream, true, false))) computable(opt->opt_csb, value, stream, true, false)))
{ {
@ -6756,14 +6758,11 @@ static SSHORT match_index(thread_db* tdbb,
for (OptimizerBlk::opt_segment* ptr = opt->opt_segments; i < idx->idx_count; for (OptimizerBlk::opt_segment* ptr = opt->opt_segments; i < idx->idx_count;
i++, ptr++) i++, ptr++)
{ {
if if (
#ifdef EXPRESSION_INDICES #ifdef EXPRESSION_INDICES
((idx->idx_flags & idx_expressn) || (idx->idx_flags & idx_expressn) ||
#endif
((USHORT)(IPTR) match->nod_arg[e_fld_id] == idx->idx_rpt[i].idx_field)
#ifdef EXPRESSION_INDICES
)
#endif #endif
(USHORT)(IPTR) match->nod_arg[e_fld_id] == idx->idx_rpt[i].idx_field)
{ {
++count; ++count;
/* AB: If we have already an exact match don't /* AB: If we have already an exact match don't