Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[53110] firebird/trunk
|
From: <asf...@us...> - 2011-06-04 02:19:02
|
Revision: 53110
http://firebird.svn.sourceforge.net/firebird/?rev=53110&view=rev
Author: asfernandes
Date: 2011-06-04 02:18:55 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/misc/posixLibrary.sh.in
firebird/trunk/src/burp/restore.epp
firebird/trunk/src/common/fb_exception.cpp
firebird/trunk/src/jrd/dfw.epp
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/flu.cpp
firebird/trunk/src/jrd/flu.h
firebird/trunk/src/jrd/met.epp
Modified: firebird/trunk/builds/install/misc/posixLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/posixLibrary.sh.in 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/builds/install/misc/posixLibrary.sh.in 2011-06-04 02:18:55 UTC (rev 53110)
@@ -858,4 +858,3 @@
export InteractiveInstall
fi
}
-
Modified: firebird/trunk/src/burp/restore.epp
===================================================================
--- firebird/trunk/src/burp/restore.epp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/burp/restore.epp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -10339,15 +10339,15 @@
general_on_error();
}
-const FixGenerator genToFix[] =
+static const FixGenerator genToFix[] =
{
- { "RDB$CONSTRAINT_NAME", "RDB$RELATION_CONSTRAINTS", "RDB$CONSTRAINT_NAME", "INTEG_" },
- { "RDB$FIELD_NAME", "RDB$FIELDS", "RDB$FIELD_NAME", "RDB$" },
- { "RDB$INDEX_NAME", "RDB$INDICES", "RDB$INDEX_NAME", "RDB$" },
- { "RDB$INDEX_NAME", "RDB$INDICES", "RDB$INDEX_NAME", "RDB$PRIMARY" },
- { "RDB$INDEX_NAME", "RDB$INDICES", "RDB$INDEX_NAME", "RDB$FOREIGN" },
- { "RDB$TRIGGER_NAME", "RDB$TRIGGERS", "RDB$TRIGGER_NAME", "CHECK_" },
-// "RDB$BACKUP_HISTORY" // unused ???
+ { "RDB$CONSTRAINT_NAME", "RDB$RELATION_CONSTRAINTS", "RDB$CONSTRAINT_NAME", "INTEG_" },
+ { "RDB$FIELD_NAME", "RDB$FIELDS", "RDB$FIELD_NAME", "RDB$" },
+ { "RDB$INDEX_NAME", "RDB$INDICES", "RDB$INDEX_NAME", "RDB$" },
+ { "RDB$INDEX_NAME", "RDB$INDICES", "RDB$INDEX_NAME", "RDB$PRIMARY" },
+ { "RDB$INDEX_NAME", "RDB$INDICES", "RDB$INDEX_NAME", "RDB$FOREIGN" },
+ { "RDB$TRIGGER_NAME", "RDB$TRIGGERS", "RDB$TRIGGER_NAME", "CHECK_" },
+ ///"RDB$BACKUP_HISTORY" // unused ???
{ "RDB$GENERATOR_NAME", "RDB$GENERATORS", "RDB$GENERATOR_NAME", "RDB$" },
{ NULL, NULL, NULL, NULL }
};
Modified: firebird/trunk/src/common/fb_exception.cpp
===================================================================
--- firebird/trunk/src/common/fb_exception.cpp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/common/fb_exception.cpp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -1,7 +1,5 @@
#include "firebird.h"
-
#include "firebird/Provider.h"
-
#include <string.h>
#include <errno.h>
#include <stdarg.h>
Modified: firebird/trunk/src/jrd/dfw.epp
===================================================================
--- firebird/trunk/src/jrd/dfw.epp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/jrd/dfw.epp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -4038,12 +4038,11 @@
}
relation = MET_lookup_relation_id(tdbb, work->dfw_id, false);
- if (!relation) {
+ if (!relation)
return false;
- }
- check_dependencies(tdbb, work->dfw_name.c_str(), NULL, NULL,
- relation->isView() ? obj_view : obj_relation, transaction);
+ check_dependencies(tdbb, work->dfw_name.c_str(), NULL, NULL,
+ (relation->isView() ? obj_view : obj_relation), transaction);
return true;
case 2:
@@ -4262,7 +4261,7 @@
if ( (relation = MET_lookup_relation_id(tdbb, work->dfw_id, false)) )
{
check_dependencies(tdbb, relation->rel_name.c_str(), work->dfw_name.c_str(), NULL,
- relation->isView() ? obj_view : obj_relation,
+ (relation->isView() ? obj_view : obj_relation),
transaction);
}
Modified: firebird/trunk/src/jrd/dpm.epp
===================================================================
--- firebird/trunk/src/jrd/dpm.epp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/jrd/dpm.epp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -1273,9 +1273,8 @@
*ptr += val;
}
- if (transaction) {
+ if (transaction)
transaction->tra_flags |= TRA_write;
- }
}
const SINT64 value = *ptr;
Modified: firebird/trunk/src/jrd/extds/InternalDS.cpp
===================================================================
--- firebird/trunk/src/jrd/extds/InternalDS.cpp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/jrd/extds/InternalDS.cpp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -264,9 +264,8 @@
{
fb_assert(!m_transaction);
- if (m_scope == traCommon && m_IntConnection.isCurrent()) {
+ if (m_scope == traCommon && m_IntConnection.isCurrent())
m_transaction = tdbb->getTransaction()->getInterface();
- }
else
{
JAttachment* att = m_IntConnection.getJrdAtt();
Modified: firebird/trunk/src/jrd/flu.cpp
===================================================================
--- firebird/trunk/src/jrd/flu.cpp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/jrd/flu.cpp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -241,7 +241,7 @@
// Search for module name in UdfAccess restricted
// paths list
PathUtils::splitLastComponent(path, relative, fixedModule);
- if (path.length() == 0 && PathUtils::isRelative(fixedModule))
+ if (path.isEmpty() && PathUtils::isRelative(fixedModule))
{
path = fixedModule;
if (! iUdfDirectoryList().expandFileName(fixedModule, path))
Modified: firebird/trunk/src/jrd/flu.h
===================================================================
--- firebird/trunk/src/jrd/flu.h 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/jrd/flu.h 2011-06-04 02:18:55 UTC (rev 53110)
@@ -48,7 +48,7 @@
ModuleLoader::Module* handle;
Firebird::PathName originalName, loadName;
- void *findSymbol(const Firebird::string& name)
+ void* findSymbol(const Firebird::string& name)
{
if (! handle)
{
@@ -62,7 +62,8 @@
const Firebird::PathName& on,
const Firebird::PathName& ln)
: handle(h),
- originalName(p, on), loadName(p, ln)
+ originalName(p, on),
+ loadName(p, ln)
{ }
~InternalModule();
Modified: firebird/trunk/src/jrd/met.epp
===================================================================
--- firebird/trunk/src/jrd/met.epp 2011-06-04 02:18:06 UTC (rev 53109)
+++ firebird/trunk/src/jrd/met.epp 2011-06-04 02:18:55 UTC (rev 53110)
@@ -2487,7 +2487,7 @@
}
relation->rel_flags |= get_rel_flags_from_FLAGS(X.RDB$FLAGS);
-
+
if (!X.RDB$RELATION_TYPE.NULL)
{
relation->rel_flags |= MET_get_rel_flags_from_TYPE(X.RDB$RELATION_TYPE);
@@ -2571,7 +2571,7 @@
}
relation->rel_flags |= get_rel_flags_from_FLAGS(X.RDB$FLAGS);
-
+
if (!X.RDB$RELATION_TYPE.NULL)
{
relation->rel_flags |= MET_get_rel_flags_from_TYPE(X.RDB$RELATION_TYPE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
