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

a) Two vars in scope.

Browse Source 
b) Style.
This commit is contained in:
robocop 2004-10-20 00:07:49 +00:00
parent 75fc254f3d
commit f18fe3b641
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jrd/idx.cpp
View File

@ -964,9 +964,7 @@ static IDX_E check_duplicates(
if (record_idx->idx_flags & idx_expressn) if (record_idx->idx_flags & idx_expressn)
{ {
DSC *desc_ptr1, *desc_ptr2; fb_assert(insertion_idx->idx_expression != NULL);
fb_assert(insertion_idx->idx_expression != NULL);
fb_assert(insertion_idx->idx_expression_request->req_caller == NULL); fb_assert(insertion_idx->idx_expression_request->req_caller == NULL);
insertion_idx->idx_expression_request->req_caller = tdbb->tdbb_request; insertion_idx->idx_expression_request->req_caller = tdbb->tdbb_request;
@ -980,6 +978,7 @@ static IDX_E check_duplicates(
tdbb->tdbb_request = insertion_idx->idx_expression_request; tdbb->tdbb_request = insertion_idx->idx_expression_request;
tdbb->tdbb_request->req_rpb[0].rpb_record = rpb.rpb_record; tdbb->tdbb_request->req_rpb[0].rpb_record = rpb.rpb_record;
tdbb->tdbb_request->req_flags &= ~req_null; tdbb->tdbb_request->req_flags &= ~req_null;
const dsc* desc_ptr1;
{ {
Jrd::ContextPoolHolder context(tdbb, tdbb->tdbb_request->req_pool); Jrd::ContextPoolHolder context(tdbb, tdbb->tdbb_request->req_pool);
@ -1006,6 +1005,7 @@ static IDX_E check_duplicates(
tdbb->tdbb_request = record_idx->idx_expression_request; tdbb->tdbb_request = record_idx->idx_expression_request;
tdbb->tdbb_request->req_rpb[0].rpb_record = record; tdbb->tdbb_request->req_rpb[0].rpb_record = record;
tdbb->tdbb_request->req_flags &= ~req_null; tdbb->tdbb_request->req_flags &= ~req_null;
const dsc* desc_ptr2;
{ {
Jrd::ContextPoolHolder context(tdbb, tdbb->tdbb_request->req_pool); Jrd::ContextPoolHolder context(tdbb, tdbb->tdbb_request->req_pool);
@ -1044,7 +1044,7 @@ static IDX_E check_duplicates(
const bool notEqualCur = !hasCurValues || const bool notEqualCur = !hasCurValues ||
hasCurValues && ( (flag_cur != flag_idx) || (MOV_compare(&desc1, &desc2) != 0) ); hasCurValues && ( (flag_cur != flag_idx) || (MOV_compare(&desc1, &desc2) != 0) );
if((isFK || !hasOldValues) && notEqualCur) if ((isFK || !hasOldValues) && notEqualCur)
break; break;
if (hasOldValues) if (hasOldValues)
@ -1054,7 +1054,7 @@ static IDX_E check_duplicates(
const bool notEqualOld = (flag_old != flag_idx || MOV_compare(&desc1, &desc2) != 0); const bool notEqualOld = (flag_old != flag_idx || MOV_compare(&desc1, &desc2) != 0);
if(isFK) { if (isFK) {
if (notEqualCur || notEqualOld) if (notEqualCur || notEqualOld)
break; break;
} }