From 85335c5cbbd35008357f328c0c2efe05e9a9e521 Mon Sep 17 00:00:00 2001 From: asfernandes Date: Wed, 28 Oct 2009 15:31:07 +0000 Subject: [PATCH] Misc and bugfix per Claudio --- src/jrd/VirtualTable.h | 2 +- src/jrd/WindowRsb.h | 2 +- src/jrd/why.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jrd/VirtualTable.h b/src/jrd/VirtualTable.h index cb8d989dd5..bb42ad77b7 100644 --- a/src/jrd/VirtualTable.h +++ b/src/jrd/VirtualTable.h @@ -45,7 +45,7 @@ public: class VirtualTable : public RecordStream { -public: +private: VirtualTable(RecordSource* aRsb) : rsb(aRsb) { diff --git a/src/jrd/WindowRsb.h b/src/jrd/WindowRsb.h index 28deb3b59c..3292c6428f 100644 --- a/src/jrd/WindowRsb.h +++ b/src/jrd/WindowRsb.h @@ -30,7 +30,7 @@ namespace Jrd { class WindowRsb : public RecordStream { -public: +private: WindowRsb(RecordSource* aRsb); public: diff --git a/src/jrd/why.cpp b/src/jrd/why.cpp index 6949cd81c0..7282be9c39 100644 --- a/src/jrd/why.cpp +++ b/src/jrd/why.cpp @@ -4865,13 +4865,13 @@ ISC_STATUS API_ROUTINE GDS_START_MULTIPLE(ISC_STATUS* user_status, if (count <= 0 || !vector) status_exception::raise(Arg::Gds(isc_bad_teb_form)); - if (vector->teb_tpb_length < 0 || (vector->teb_tpb_length > 0 && !vector->teb_tpb)) - status_exception::raise(Arg::Gds(isc_bad_tpb_form)); - Transaction* ptr = &transaction; for (USHORT n = 0; n < count; n++, ptr = &(*ptr)->next, vector++) { + if (vector->teb_tpb_length < 0 || (vector->teb_tpb_length > 0 && !vector->teb_tpb)) + status_exception::raise(Arg::Gds(isc_bad_tpb_form)); + attachment = translate(vector->teb_database); *ptr = new CTransaction(0, 0, attachment);