From ee46acd6bcba9e6bde634064b46755ce812d4fee Mon Sep 17 00:00:00 2001
From: robocop <robocop@users.sourceforge.net>
Date: Thu, 3 Apr 2008 13:17:32 +0000
Subject: [PATCH] Misc.

---
 src/common/classes/fb_atomic.h | 4 ++--
 src/dsql/pass1.cpp             | 2 +-
 src/jrd/why.cpp                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/classes/fb_atomic.h b/src/common/classes/fb_atomic.h
index 7aac7e99a2..21d9924dcc 100644
--- a/src/common/classes/fb_atomic.h
+++ b/src/common/classes/fb_atomic.h
@@ -129,9 +129,9 @@ private:
 namespace Firebird {
 
 // Highly inefficient, but safe and portable implementation
-// We keep it for DEV build to start doing ports, but should be avoid in release
+// We keep it for DEV build to start doing ports, but should be avoided in release
 #ifndef DEV_BUILD
-#pragma FB_COMPILER_MESSAGE("Generic AtomicCounter: implement appropriate for your platform!"
+#pragma FB_COMPILER_MESSAGE("Generic AtomicCounter: implement appropriate code for your platform!"
 #endif
 class AtomicCounter
 {
diff --git a/src/dsql/pass1.cpp b/src/dsql/pass1.cpp
index e41694b33c..16c7d945d2 100644
--- a/src/dsql/pass1.cpp
+++ b/src/dsql/pass1.cpp
@@ -4115,7 +4115,7 @@ static dsql_nod* pass1_dbkey( dsql_req* request, dsql_nod* input)
 			if (rlxAlias == cfgRlxAlias)
 				break;
 			
-			rlxAlias = cfgRlxAlias ;
+			rlxAlias = cfgRlxAlias;
 		}
 	}
 
diff --git a/src/jrd/why.cpp b/src/jrd/why.cpp
index 24db41c004..d226160a60 100644
--- a/src/jrd/why.cpp
+++ b/src/jrd/why.cpp
@@ -6092,7 +6092,7 @@ int API_ROUTINE fb_shutdown(unsigned int timeout)
 		// shutdown yValve
 		shutdownStarted = true;	// since this moment no new thread will be able to enter yValve
 
-		FB_UINT64 timeLimit = getMilliTime() + timeout;
+		const FB_UINT64 timeLimit = getMilliTime() + timeout;
 
 		for (;;)
 		{