Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[57011] firebird/trunk
|
From: <ro...@us...> - 2012-08-08 02:20:37
|
Revision: 57011
http://firebird.svn.sourceforge.net/firebird/?rev=57011&view=rev
Author: robocop
Date: 2012-08-08 02:20:30 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/src/burp/burp.h
firebird/trunk/src/common/classes/alloc.h
firebird/trunk/src/common/cvt.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/include/firebird/Crypt.h
firebird/trunk/src/jrd/CryptoManager.h
firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
firebird/trunk/src/lock/print.cpp
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/history2.sql
firebird/trunk/src/remote/server/server.cpp
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2012-08-08 02:20:30 UTC (rev 57011)
@@ -145,7 +145,7 @@
class CallbackInterface : public ICryptKeyCallback
{
public:
- CallbackInterface(CryptKeyHolder* p)
+ explicit CallbackInterface(CryptKeyHolder* p)
: parent(p)
{ }
Modified: firebird/trunk/src/burp/burp.h
===================================================================
--- firebird/trunk/src/burp/burp.h 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/burp/burp.h 2012-08-08 02:20:30 UTC (rev 57011)
@@ -868,7 +868,7 @@
class BurpGlobals : public ThreadData
{
public:
- BurpGlobals(Firebird::UtilSvc* us)
+ explicit BurpGlobals(Firebird::UtilSvc* us)
: ThreadData(ThreadData::tddGBL),
defaultCollations(*getDefaultMemoryPool()),
uSvc(us),
Modified: firebird/trunk/src/common/classes/alloc.h
===================================================================
--- firebird/trunk/src/common/classes/alloc.h 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/common/classes/alloc.h 2012-08-08 02:20:30 UTC (rev 57011)
@@ -491,7 +491,7 @@
#endif
#ifndef USE_SYSTEM_NEW
-// We must define placement operators NEW & DELETE ourself
+// We must define placement operators NEW & DELETE ourselves
inline void* operator new(size_t s, void* place) throw ()
{
return place;
Modified: firebird/trunk/src/common/cvt.cpp
===================================================================
--- firebird/trunk/src/common/cvt.cpp 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/common/cvt.cpp 2012-08-08 02:20:30 UTC (rev 57011)
@@ -124,7 +124,7 @@
#define CVT_COPY_BUFF(from, to, len) \
{if (len) {memcpy(to, from, len); from += len; to += len;} }
-// AP,2012: Look like there is no need making len zero, but I keep old define for a reference.
+// AP,2012: Looks like there is no need making len zero, but I keep old define for a reference.
// {if (len) {memcpy(to, from, len); from += len; to += len; len = 0;} }
enum EXPECT_DATETIME
Modified: firebird/trunk/src/common/db_alias.cpp
===================================================================
--- firebird/trunk/src/common/db_alias.cpp 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/common/db_alias.cpp 2012-08-08 02:20:30 UTC (rev 57011)
@@ -264,7 +264,8 @@
// Checks that argument doesn't contain colon or directory separator
static inline bool hasSeparator(const PathName& name)
{
- for (const char* p = name.c_str(); *p; p++) {
+ for (const char* p = name.c_str(); *p; p++)
+ {
if (*p == ':' || *p == '/' || *p == '\\')
return true;
}
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2012-08-08 02:20:30 UTC (rev 57011)
@@ -11123,9 +11123,8 @@
decodeNode->conditions->add(cmp->arg2);
decodeNode->values->add(node->trueValue);
- ValueExprNode* last;
-
- while ((node = (last = node->falseValue)->as<ValueIfNode>()))
+ ValueExprNode* last = node->falseValue;
+ while ((node = last->as<ValueIfNode>()))
{
ComparativeBoolNode* cmp = node->condition->as<ComparativeBoolNode>();
if (!cmp || cmp->blrOp != blr_eql)
@@ -11138,6 +11137,8 @@
decodeNode->conditions->add(cmp->arg2);
decodeNode->values->add(node->trueValue);
+
+ last = node->falseValue;
}
decodeNode->values->add(last);
Modified: firebird/trunk/src/include/firebird/Crypt.h
===================================================================
--- firebird/trunk/src/include/firebird/Crypt.h 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/include/firebird/Crypt.h 2012-08-08 02:20:30 UTC (rev 57011)
@@ -48,7 +48,7 @@
// Part 2. Database crypt.
-// This interface is used to transfer some data (related with crypt keys)
+// This interface is used to transfer some data (related to crypt keys)
// between different components of firebird.
class ICryptKeyCallback : public IVersioned
{
Modified: firebird/trunk/src/jrd/CryptoManager.h
===================================================================
--- firebird/trunk/src/jrd/CryptoManager.h 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/jrd/CryptoManager.h 2012-08-08 02:20:30 UTC (rev 57011)
@@ -64,7 +64,7 @@
class CryptoManager : public Firebird::PermanentStorage
{
public:
- CryptoManager(thread_db* tdbb);
+ explicit CryptoManager(thread_db* tdbb);
~CryptoManager();
void shutdown(thread_db* tdbb);
@@ -100,7 +100,7 @@
class HolderAttachments
{
public:
- HolderAttachments(Firebird::MemoryPool& p);
+ explicit HolderAttachments(Firebird::MemoryPool& p);
~HolderAttachments();
void registerAttachment(Attachment* att);
@@ -122,7 +122,7 @@
class KeyHolderPlugins
{
public:
- KeyHolderPlugins(Firebird::MemoryPool& p)
+ explicit KeyHolderPlugins(Firebird::MemoryPool& p)
: knownHolders(p)
{ }
Modified: firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceJrdHelpers.h 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/jrd/trace/TraceJrdHelpers.h 2012-08-08 02:20:30 UTC (rev 57011)
@@ -416,7 +416,7 @@
{
// implementation is at tra.cpp
public:
- TraceSweepEvent(thread_db* tdbb);
+ explicit TraceSweepEvent(thread_db* tdbb);
~TraceSweepEvent();
Modified: firebird/trunk/src/lock/print.cpp
===================================================================
--- firebird/trunk/src/lock/print.cpp 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/lock/print.cpp 2012-08-08 02:20:30 UTC (rev 57011)
@@ -1274,28 +1274,30 @@
FPRINTF(outfile, "\n");
- if (sw_requests && !sw_pending)
+ if (sw_requests)
{
- const srq* que_inst;
- SRQ_LOOP(owner->own_requests, que_inst)
- prt_request(outfile, LOCK_header,
- (lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_own_requests)));
+ if (sw_pending)
+ {
+ const srq* que_inst;
+ SRQ_LOOP(owner->own_pending, que_inst)
+ prt_request(outfile, LOCK_header,
+ (lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_own_pending)));
+ }
+ else
+ {
+ const srq* que_inst;
+ SRQ_LOOP(owner->own_requests, que_inst)
+ prt_request(outfile, LOCK_header,
+ (lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_own_requests)));
+ }
}
-
- if (sw_requests && sw_pending)
- {
- const srq* que_inst;
- SRQ_LOOP(owner->own_pending, que_inst)
- prt_request(outfile, LOCK_header,
- (lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_own_pending)));
- }
}
static void prt_owner_wait_cycle(OUTFILE outfile,
const lhb* LOCK_header,
const own* owner,
- USHORT indent, waitque *waiters)
+ USHORT indent, waitque* waiters)
{
/**************************************
*
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/msgs/facilities2.sql 2012-08-08 02:20:30 UTC (rev 57011)
@@ -9,7 +9,7 @@
('2012-01-13 11:20:16', 'DYN', 8, 285)
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
-('2012-03-02 11:55:44', 'GBAK', 12, 352)
+('2012-06-23 05:40:21', 'GBAK', 12, 352)
('2012-02-18 20:00:00', 'SQLERR', 13, 1033)
('1996-11-07 13:38:42', 'SQLWARN', 14, 613)
('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307)
Modified: firebird/trunk/src/msgs/history2.sql
===================================================================
--- firebird/trunk/src/msgs/history2.sql 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/msgs/history2.sql 2012-08-08 02:20:30 UTC (rev 57011)
@@ -1258,6 +1258,7 @@
(1249, 'alexpeshkoff', '2009-11-13 17:49:54', 18, 27, '------------------------------------------------------------------------------------------', NULL, NULL, 'c_pg')
(1250, 'cvc', '2009-12-18 09:21:40', 12, 68, ' committing metadata', NULL, NULL, 'c_pg')
(1251, 'cvc', '2009-12-18 08:21:50', 12, 196, 'restoring parameter @1 for stored procedure', NULL, NULL, 'c_pg')
+(1252, 'alexpeshkoff', '2012-06-23 05:40:21', 12, 266, 'standard output is not supported when using split operation', NULL, NULL, 'c_pg')
stop
COMMIT WORK;
Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp 2012-08-07 19:13:08 UTC (rev 57010)
+++ firebird/trunk/src/remote/server/server.cpp 2012-08-08 02:20:30 UTC (rev 57011)
@@ -747,7 +747,7 @@
class CryptKeyCallback : public VersionedIface<ICryptKeyCallback, FB_CRYPT_CALLBACK_VERSION>
{
public:
- CryptKeyCallback(rem_port* prt)
+ explicit CryptKeyCallback(rem_port* prt)
: port(prt), l(0), d(NULL)
{ }
@@ -792,7 +792,7 @@
class ServerCallback : public ServerCallbackBase, public GlobalStorage
{
public:
- ServerCallback(rem_port* prt)
+ explicit ServerCallback(rem_port* prt)
: cryptCallback(prt)
{ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
