From f18fe3b64114885a1ab71e3a6d75b8f2d3ed4233 Mon Sep 17 00:00:00 2001 From: robocop Date: Wed, 20 Oct 2004 00:07:49 +0000 Subject: [PATCH] a) Two vars in scope. b) Style. --- src/jrd/idx.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jrd/idx.cpp b/src/jrd/idx.cpp index 5bc5b57dc1..5e8c2e8697 100644 --- a/src/jrd/idx.cpp +++ b/src/jrd/idx.cpp @@ -964,9 +964,7 @@ static IDX_E check_duplicates( 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); 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->req_rpb[0].rpb_record = rpb.rpb_record; tdbb->tdbb_request->req_flags &= ~req_null; + const dsc* desc_ptr1; { 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->req_rpb[0].rpb_record = record; tdbb->tdbb_request->req_flags &= ~req_null; + const dsc* desc_ptr2; { Jrd::ContextPoolHolder context(tdbb, tdbb->tdbb_request->req_pool); @@ -1044,7 +1044,7 @@ static IDX_E check_duplicates( const bool notEqualCur = !hasCurValues || hasCurValues && ( (flag_cur != flag_idx) || (MOV_compare(&desc1, &desc2) != 0) ); - if((isFK || !hasOldValues) && notEqualCur) + if ((isFK || !hasOldValues) && notEqualCur) break; if (hasOldValues) @@ -1054,7 +1054,7 @@ static IDX_E check_duplicates( const bool notEqualOld = (flag_old != flag_idx || MOV_compare(&desc1, &desc2) != 0); - if(isFK) { + if (isFK) { if (notEqualCur || notEqualOld) break; }