[Firebird-checkins] SF.net SVN: firebird:[59224] firebird/trunk

[<asf...@us...>]

Revision: 59224
          http://sourceforge.net/p/firebird/code/59224
Author:   asfernandes
Date:     2014-03-04 02:12:15 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/builds/install/arch-specific/linux/README
    firebird/trunk/src/burp/restore.epp
    firebird/trunk/src/common/os/win32/mod_loader.cpp
    firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
    firebird/trunk/src/jrd/trace/TraceObjects.h

Modified: firebird/trunk/builds/install/arch-specific/linux/README
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/README	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/builds/install/arch-specific/linux/README	2014-03-04 02:12:15 UTC (rev 59224)
@@ -10,7 +10,11 @@
 
 http://www.ibphoenix.com
 
-Firebird is a relational database offering many ANSI SQL standard features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names, since 1981.
+Firebird is a relational database offering many ANSI SQL standard features that
+runs on Linux, Windows, and a variety of Unix platforms. Firebird offers
+excellent concurrency, high performance, and powerful language support for
+stored procedures and triggers. It has been used in production systems, under a
+variety of names, since 1981.
 
 http://www.firebirdsql.org/en/about-firebird/
 

Modified: firebird/trunk/src/burp/restore.epp
===================================================================
--- firebird/trunk/src/burp/restore.epp	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/burp/restore.epp	2014-03-04 02:12:15 UTC (rev 59224)
@@ -9097,8 +9097,6 @@
 			X.RDB$OBJECT_TYPE.NULL = FALSE;
 			X.RDB$OBJECT_TYPE = object_type;
 
-
-
 			// If OBJECT_TYPE didn't exist before and we have a field level
 			// user privileges, then use obj_field instead.
 
@@ -9495,8 +9493,8 @@
  *	than the new.
  *
  **************************************/
-	UCHAR* p = 0;
-	const UCHAR* q = 0;
+	UCHAR* p = NULL;
+	const UCHAR* q = NULL;
 
 	for (const burp_fld* field = relation->rel_fields; field; field = field->fld_next)
 	{

Modified: firebird/trunk/src/common/os/win32/mod_loader.cpp
===================================================================
--- firebird/trunk/src/common/os/win32/mod_loader.cpp	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/common/os/win32/mod_loader.cpp	2014-03-04 02:12:15 UTC (rev 59224)
@@ -168,7 +168,7 @@
 {
 	ContextActivator ctx;
 
-	const HMODULE hMod = 
+	const HMODULE hMod =
 		LoadLibraryEx(module.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_AS_DATAFILE);
 
 	if (hMod) {
@@ -206,9 +206,7 @@
 	}
 
 	if (!module)
-	{
 		module = LoadLibraryEx(modPath.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
-	}
 
 	// Restore old mode in case we are embedded into user application
 	SetErrorMode(oldErrorMode);

Modified: firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceJrdHelpers.h	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/jrd/trace/TraceJrdHelpers.h	2014-03-04 02:12:15 UTC (rev 59224)
@@ -223,7 +223,7 @@
 class TraceFuncExecute
 {
 public:
-	TraceFuncExecute(thread_db* tdbb, jrd_req* request, jrd_req* caller, 
+	TraceFuncExecute(thread_db* tdbb, jrd_req* request, jrd_req* caller,
 					 const UCHAR* inMsg, ULONG inMsgLength) :
 		m_tdbb(tdbb),
 		m_request(request),
@@ -241,8 +241,8 @@
 		{	// scope
 			TraceConnectionImpl conn(m_tdbb->getAttachment());
 			TraceTransactionImpl tran(m_tdbb->getTransaction());
-			
-			TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(), 
+
+			TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(),
 				m_request->getStatement()->function->getInputFormat(),
 				m_inMsg, m_inMsgLength);
 			TraceFunctionImpl func(m_request, &inputs, NULL, NULL);
@@ -280,7 +280,7 @@
 		TraceConnectionImpl conn(m_tdbb->getAttachment());
 		TraceTransactionImpl tran(m_tdbb->getTransaction());
 
-		TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(), 
+		TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(),
 			m_request->getStatement()->function->getInputFormat(),
 			m_inMsg, m_inMsgLength);
 
@@ -298,7 +298,7 @@
 	bool m_need_trace;
 	thread_db* const m_tdbb;
 	jrd_req* const m_request;
-	const UCHAR* m_inMsg; 
+	const UCHAR* m_inMsg;
 	ULONG m_inMsgLength;
 	SINT64 m_start_clock;
 };

Modified: firebird/trunk/src/jrd/trace/TraceObjects.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.h	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/jrd/trace/TraceObjects.h	2014-03-04 02:12:15 UTC (rev 59224)
@@ -280,7 +280,7 @@
 class TraceParamsFromMsgImpl : public TraceParamsImpl
 {
 public:
-	TraceParamsFromMsgImpl(Firebird::MemoryPool& pool, const Format* format, 
+	TraceParamsFromMsgImpl(Firebird::MemoryPool& pool, const Format* format,
 		const UCHAR* inMsg, ULONG inMsgLength) :
 		TraceParamsImpl(pool),
 		m_format(format),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.