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

Misc.

Browse Source
This commit is contained in:
robocop 2012-08-08 02:20:30 +00:00
parent 7ce7542fec
commit f601bbdb8b
13 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dbcrypt/CryptKeyHolder.cpp
View File

@ -145,7 +145,7 @@ private:
class CallbackInterface : public ICryptKeyCallback
{
public:
CallbackInterface(CryptKeyHolder* p)
explicit CallbackInterface(CryptKeyHolder* p)
: parent(p)
{ }

2
src/burp/burp.h
View File

@ -868,7 +868,7 @@ const unsigned int MIN_SPLIT_SIZE = 2048; // bytes
class BurpGlobals : public ThreadData
{
public:
BurpGlobals(Firebird::UtilSvc* us)
explicit BurpGlobals(Firebird::UtilSvc* us)
: ThreadData(ThreadData::tddGBL),
defaultCollations(*getDefaultMemoryPool()),
uSvc(us),

2
src/common/classes/alloc.h
View File

@ -491,7 +491,7 @@ inline void* operator new[](size_t s, Firebird::MemoryPool& pool) throw (OOM_EXC
#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;

2
src/common/cvt.cpp
View File

@ -124,7 +124,7 @@ using namespace Firebird;
#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

3
src/common/db_alias.cpp
View File

@ -264,7 +264,8 @@ namespace
// 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;
}

7
src/dsql/ExprNodes.cpp
View File

@ -11123,9 +11123,8 @@ DmlNode* ValueIfNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
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 @@ DmlNode* ValueIfNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
decodeNode->conditions->add(cmp->arg2);
decodeNode->values->add(node->trueValue);
last = node->falseValue;
}
decodeNode->values->add(last);

2
src/include/firebird/Crypt.h
View File

@ -48,7 +48,7 @@ public:
// 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
{

6
src/jrd/CryptoManager.h
View File

@ -64,7 +64,7 @@ class Lock;
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 @@ private:
class HolderAttachments
{
public:
HolderAttachments(Firebird::MemoryPool& p);
explicit HolderAttachments(Firebird::MemoryPool& p);
~HolderAttachments();
void registerAttachment(Attachment* att);
@ -122,7 +122,7 @@ private:
class KeyHolderPlugins
{
public:
KeyHolderPlugins(Firebird::MemoryPool& p)
explicit KeyHolderPlugins(Firebird::MemoryPool& p)
: knownHolders(p)
{ }

2
src/jrd/trace/TraceJrdHelpers.h
View File

@ -416,7 +416,7 @@ class TraceSweepEvent
{
// implementation is at tra.cpp
public:
TraceSweepEvent(thread_db* tdbb);
explicit TraceSweepEvent(thread_db* tdbb);
~TraceSweepEvent();

20
src/lock/print.cpp
View File

@ -1274,20 +1274,22 @@ static void prt_owner(OUTFILE outfile,
FPRINTF(outfile, "\n");
if (sw_requests && !sw_pending)
if (sw_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)));
}
}
@ -1295,7 +1297,7 @@ static void prt_owner(OUTFILE outfile,
static void prt_owner_wait_cycle(OUTFILE outfile,
const lhb* LOCK_header,
const own* owner,
USHORT indent, waitque *waiters)
USHORT indent, waitque* waiters)
{
/**************************************
*

2
src/msgs/facilities2.sql
View File

@ -9,7 +9,7 @@ set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUM
('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)

1
src/msgs/history2.sql
View File

@ -1258,6 +1258,7 @@ Fetches = !f', NULL, NULL, 'c_pg');
(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;

4
src/remote/server/server.cpp
View File

@ -747,7 +747,7 @@ InitInstance<CryptKeyTypeManager> knownCryptKeyTypes;
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 @@ private:
class ServerCallback : public ServerCallbackBase, public GlobalStorage
{
public:
ServerCallback(rem_port* prt)
explicit ServerCallback(rem_port* prt)
: cryptCallback(prt)
{ }