Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[60690] firebird/trunk
|
From: <asf...@us...> - 2015-02-14 18:55:02
|
Revision: 60690
http://sourceforge.net/p/firebird/code/60690
Author: asfernandes
Date: 2015-02-14 18:55:00 +0000 (Sat, 14 Feb 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/posix/udr_plugin.vers
firebird/trunk/examples/interfaces/01.create.cpp
firebird/trunk/examples/interfaces/02.update.cpp
firebird/trunk/src/alice/main/aliceMain.cpp
firebird/trunk/src/burp/main/burpMain.cpp
firebird/trunk/src/common/isc.cpp
firebird/trunk/src/dsql/DsqlCursor.cpp
firebird/trunk/src/dsql/DsqlCursor.h
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/lock/lock.cpp
firebird/trunk/src/lock/print.cpp
firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/utilities/gsec/main/gsecMain.cpp
firebird/trunk/src/utilities/gstat/main/gstatMain.cpp
firebird/trunk/src/yvalve/DistributedTransaction.cpp
firebird/trunk/src/yvalve/DistributedTransaction.h
Modified: firebird/trunk/builds/posix/udr_plugin.vers
===================================================================
--- firebird/trunk/builds/posix/udr_plugin.vers 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/builds/posix/udr_plugin.vers 2015-02-14 18:55:00 UTC (rev 60690)
@@ -13,7 +13,7 @@
# See the License for the specific language governing rights
# and limitations under the License.
#
-# The Original Code was created by Nickolay Samofatov
+# The Original Code was created by Adriano dos Santos Fernandes
# for the Firebird Open Source RDBMS project.
#
# Copyright (c) 2015 Adriano dos Santos Fernandes <adr...@gm...>
Modified: firebird/trunk/examples/interfaces/01.create.cpp
===================================================================
--- firebird/trunk/examples/interfaces/01.create.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/examples/interfaces/01.create.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -3,7 +3,7 @@
* MODULE: 01.create.cpp
* DESCRIPTION: A sample of creating new database and new table in it.
* Run second time (whene database already exists) to see
- * how FbException is caught and handled by thid code.
+ * how FbException is caught and handled by this code.
*
* Example for the following interfaces:
* IMaster - main inteface to access all the rest
Modified: firebird/trunk/examples/interfaces/02.update.cpp
===================================================================
--- firebird/trunk/examples/interfaces/02.update.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/examples/interfaces/02.update.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -131,7 +131,7 @@
{
stmt->execute(&status, tra, meta, buffer, NULL, NULL);
}
- catch(const FbException& error)
+ catch (const FbException& error)
{
// Handle exception raised during statement execution
int sqlcode = isc_sqlcode(error.getStatus()->getErrors());
@@ -210,4 +210,3 @@
return 1;
}
-
Modified: firebird/trunk/src/alice/main/aliceMain.cpp
===================================================================
--- firebird/trunk/src/alice/main/aliceMain.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/alice/main/aliceMain.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
return alice(uSvc);
}
- catch(const Firebird::Exception& ex)
+ catch (const Firebird::Exception& ex)
{
ISC_STATUS_ARRAY st;
ex.stuff_exception(st);
Modified: firebird/trunk/src/burp/main/burpMain.cpp
===================================================================
--- firebird/trunk/src/burp/main/burpMain.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/burp/main/burpMain.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
return gbak(uSvc);
}
- catch(const Firebird::Exception& ex)
+ catch (const Firebird::Exception& ex)
{
ISC_STATUS_ARRAY st;
ex.stuff_exception(st);
Modified: firebird/trunk/src/common/isc.cpp
===================================================================
--- firebird/trunk/src/common/isc.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/common/isc.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -355,7 +355,7 @@
p = password->pw_name;
else
p = "";
-#ifndef ANDROID // Why do they print silly unimplemted message for this function?
+#ifndef ANDROID // Why do they print silly unimplemented message for this function?
endpwent();
#endif
Modified: firebird/trunk/src/dsql/DsqlCursor.cpp
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -30,8 +30,8 @@
using namespace Firebird;
using namespace Jrd;
-const char* const SCRATCH = "fb_cursor_";
-const ULONG PREFETCH_SIZE = 65536; // 64 KB
+static const char* const SCRATCH = "fb_cursor_";
+static const ULONG PREFETCH_SIZE = 65536; // 64 KB
DsqlCursor::DsqlCursor(dsql_req* req, ULONG flags)
: m_request(req), m_flags(flags),
Modified: firebird/trunk/src/dsql/DsqlCursor.h
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.h 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/dsql/DsqlCursor.h 2015-02-14 18:55:00 UTC (rev 60690)
@@ -75,4 +75,3 @@
} // namespace
#endif // DSQL_CURSOR_H
-
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/jrd/cch.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -3242,8 +3242,8 @@
return; // false;
// hvlad: buffer is in use and we can't downgrade its lock. But if this
- // buffer blocks some lower precedence buffer, it is enough to just write
- // our (high) buffer to clear precedence and thus allow blocked (low)
+ // buffer blocks some lower precedence buffer, it is enough to just write
+ // our (high) buffer to clear precedence and thus allow blocked (low)
// buffer to be downgraded. IO lock guarantees that there is no buffer
// modification in progress currently and it is safe to write it right now.
// No need to mark our buffer as blocking nor to change state of our lock.
@@ -3255,9 +3255,9 @@
return; // true
}
- if (!oldBlocking) {
+ if (!oldBlocking)
bdb->bdb_ast_flags &= ~BDB_blocking;
- }
+
justWrite = true;
}
@@ -3397,6 +3397,7 @@
} // syncPrec scope
bdb->bdb_flags &= ~BDB_not_valid;
+
if (justWrite)
bdb->unLockIO(tdbb);
else
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/jrd/jrd.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -4495,10 +4495,8 @@
}
}
- DsqlCursor* const cursor =
- DSQL_open(tdbb, &tra, getHandle(),
- inMetadata, static_cast<UCHAR*>(inBuffer),
- outMetadata, flags);
+ DsqlCursor* const cursor = DSQL_open(tdbb, &tra, getHandle(),
+ inMetadata, static_cast<UCHAR*>(inBuffer), outMetadata, flags);
rs = new JResultSet(cursor, this);
rs->addRef();
Modified: firebird/trunk/src/lock/lock.cpp
===================================================================
--- firebird/trunk/src/lock/lock.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/lock/lock.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -1686,8 +1686,8 @@
{
TEXT bug_buffer[BUFFER_TINY];
sprintf(bug_buffer, "inconsistent lock table type/version; found %d/%d:%d, expected %d/%d:%d",
- m_sharedMemory->getHeader()->mhb_type,
- m_sharedMemory->getHeader()->mhb_header_version,
+ m_sharedMemory->getHeader()->mhb_type,
+ m_sharedMemory->getHeader()->mhb_header_version,
m_sharedMemory->getHeader()->mhb_version,
SharedMemoryBase::SRAM_LOCK_MANAGER, MemoryHeader::HEADER_VERSION, LHB_VERSION);
bug(&statusVector, bug_buffer);
Modified: firebird/trunk/src/lock/print.cpp
===================================================================
--- firebird/trunk/src/lock/print.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/lock/print.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -762,7 +762,7 @@
// if we can't read this version - admit there's nothing to say and return.
- if (LOCK_header->mhb_header_version != MemoryHeader::HEADER_VERSION ||
+ if (LOCK_header->mhb_header_version != MemoryHeader::HEADER_VERSION ||
LOCK_header->mhb_version != LHB_VERSION)
{
if (LOCK_header->mhb_type == 0 && LOCK_header->mhb_header_version == 0 && LOCK_header->mhb_version == 0)
Modified: firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
===================================================================
--- firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -127,7 +127,7 @@
k = key->getDecryptKey(&l);
de = createCypher(l, k);
}
- catch(const Exception& ex)
+ catch (const Exception& ex)
{
ex.stuffException(status);
}
Modified: firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
===================================================================
--- firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -199,8 +199,6 @@
for (bool cont = accessor.getFirst(); cont; cont = accessor.getNext())
accessor.current()->second->dispose();
}
-
- delete module;
}
public:
@@ -265,7 +263,7 @@
private:
PathName moduleName;
- ModuleLoader::Module* module;
+ AutoPtr<ModuleLoader::Module> module;
public:
FB_BOOLEAN myUnloadFlag;
Modified: firebird/trunk/src/remote/remote.cpp
===================================================================
--- firebird/trunk/src/remote/remote.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/remote/remote.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -1676,7 +1676,8 @@
}
-void InternalCryptKey::setSymmetric(Firebird::CheckStatusWrapper* status, const char* type, unsigned keyLength, const void* key)
+void InternalCryptKey::setSymmetric(Firebird::CheckStatusWrapper* status, const char* type,
+ unsigned keyLength, const void* key)
{
try
{
@@ -1685,14 +1686,15 @@
encrypt.set(keyLength, key);
decrypt.clear();
}
- catch(const Firebird::Exception& ex)
+ catch (const Firebird::Exception& ex)
{
ex.stuffException(status);
}
}
-void InternalCryptKey::setAsymmetric(Firebird::CheckStatusWrapper* status, const char* type, unsigned encryptKeyLength,
- const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey)
+void InternalCryptKey::setAsymmetric(Firebird::CheckStatusWrapper* status, const char* type,
+ unsigned encryptKeyLength, const void* encryptKey, unsigned decryptKeyLength,
+ const void* decryptKey)
{
try
{
@@ -1701,7 +1703,7 @@
encrypt.set(encryptKeyLength, encryptKey);
decrypt.set(decryptKeyLength, decryptKey);
}
- catch(const Firebird::Exception& ex)
+ catch (const Firebird::Exception& ex)
{
ex.stuffException(status);
}
Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/remote/remote.h 2015-02-14 18:55:00 UTC (rev 60690)
@@ -637,7 +637,8 @@
};
// CryptKey implementation
-class InternalCryptKey FB_FINAL : public Firebird::VersionedIface<Firebird::ICryptKeyImpl<InternalCryptKey, Firebird::CheckStatusWrapper> >,
+class InternalCryptKey FB_FINAL :
+ public Firebird::VersionedIface<Firebird::ICryptKeyImpl<InternalCryptKey, Firebird::CheckStatusWrapper> >,
public Firebird::GlobalStorage
{
public:
Modified: firebird/trunk/src/utilities/gsec/main/gsecMain.cpp
===================================================================
--- firebird/trunk/src/utilities/gsec/main/gsecMain.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/utilities/gsec/main/gsecMain.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
return gsec(uSvc);
}
- catch(const Firebird::Exception& ex)
+ catch (const Firebird::Exception& ex)
{
ISC_STATUS_ARRAY st;
ex.stuff_exception(st);
Modified: firebird/trunk/src/utilities/gstat/main/gstatMain.cpp
===================================================================
--- firebird/trunk/src/utilities/gstat/main/gstatMain.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/utilities/gstat/main/gstatMain.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
return gstat(uSvc);
}
- catch(const Firebird::Exception& ex)
+ catch (const Firebird::Exception& ex)
{
ISC_STATUS_ARRAY st;
ex.stuff_exception(st);
Modified: firebird/trunk/src/yvalve/DistributedTransaction.cpp
===================================================================
--- firebird/trunk/src/yvalve/DistributedTransaction.cpp 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/yvalve/DistributedTransaction.cpp 2015-02-14 18:55:00 UTC (rev 60690)
@@ -502,7 +502,8 @@
this->addWithTpb(status, att, 0, NULL);
}
-void DtcStart::addWithTpb(CheckStatusWrapper* status, IAttachment* att, unsigned length, const unsigned char* tpb)
+void DtcStart::addWithTpb(CheckStatusWrapper* status, IAttachment* att,
+ unsigned length, const unsigned char* tpb)
{
try
{
Modified: firebird/trunk/src/yvalve/DistributedTransaction.h
===================================================================
--- firebird/trunk/src/yvalve/DistributedTransaction.h 2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/yvalve/DistributedTransaction.h 2015-02-14 18:55:00 UTC (rev 60690)
@@ -62,7 +62,8 @@
// IDtcStart implementation
void addAttachment(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att);
- void addWithTpb(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att, unsigned length, const unsigned char* tpb);
+ void addWithTpb(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att,
+ unsigned length, const unsigned char* tpb);
YTransaction* start(Firebird::CheckStatusWrapper* status);
void dispose();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
