Misc

builds/install/misc/firebird.conf.in

@@ -276,9 +276,9 @@
 
 # ----------------------------
 # Remove protection against opening databases on NFS mounted volumes on
-# Linux/Unix and SMB/CIFS volumes on Windows
+# Linux/Unix and SMB/CIFS volumes on Windows.
 #
-# This also permits creating database shadows on mounted network volumes
+# This also permits creating database shadows on mounted network volumes.
 #
 #     ***WARNING*** ***WARNING*** ***WARNING*** ***WARNING***
 #

builds/posix/Makefile.in.firebird

@@ -482,7 +482,6 @@ rebuild_codes :
 
 
 
-
 #___________________________________________________________________________
 #
 

src/common/classes/Hash.h

@@ -30,7 +30,8 @@
 
 #include "../common/classes/vector.h"
 
-namespace Firebird {
+namespace Firebird
+{
 	template <typename K>
 	class DefaultHash
 	{
@@ -88,9 +89,9 @@ namespace Firebird {
 		class Entry;
 		friend class Entry;
 
+		// This class is supposed to be used as a BASE class for class to be hashed
 		class Entry
 		{
-			// This class is supposed to be used as a BASE class for class to be hashed
 		private:
 			Entry** previousElement;
 			Entry* nextElement;
@@ -134,7 +135,7 @@ namespace Firebird {
 					// ... and next pointer in previous element
 					*previousElement = nextElement;
 					// finally mark ourselves not linked
-					previousElement = 0;
+					previousElement = NULL;
 				}
 			}
 
@@ -301,7 +302,6 @@ namespace Firebird {
 				return !(*this == h);
 			}
 		}; // class iterator
-
 	}; // class Hash
 
 } // namespace Firebird

src/jrd/dfw.epp

@@ -306,11 +306,7 @@ public:
 	// hash interface
 	bool isEqual(const SLONG& number) const
 	{
-		if (dfw_sav_number == number)
-		{
-			return true;
-		}
-		return false;
+		return dfw_sav_number == number;
 	}
 
 	DfwSavePoint* get() { return this; }
@@ -328,7 +324,7 @@ public:
 	DeferredWork* work;
 	DeferredWork** end;
 
-	DeferredJob() : work(0), end(&work) { }
+	DeferredJob() : work(NULL), end(&work) { }
 };
 
 } // namespace Jrd
@@ -5700,7 +5696,6 @@ static string get_string(const dsc* desc)
  *
  **************************************
  *
- * Functional description
  * Get string for a given descriptor.
  *
  **************************************/
@@ -5713,7 +5708,7 @@ static string get_string(const dsc* desc)
 	}
 
 	// Find the actual length of the string, searching until the claimed
-	// end of the string, or the terminating \0, whichever comes first
+	// end of the string, or the terminating \0, whichever comes first.
 
 	USHORT length = MOV_make_string(desc, ttype_metadata, &str, &temp, sizeof(temp));
 
@@ -5732,4 +5727,3 @@ static string get_string(const dsc* desc)
 
 	return string(str, length);
 }
-

src/jrd/grant.epp

@@ -172,7 +172,8 @@ void GRANT_privileges(thread_db* tdbb, const Firebird::string& name, USHORT id,
 								 transaction);
 		}
 	}
-	else {
+	else
+	{
 		finish_security_class(acl, public_priv);
 		save_security_class(tdbb, s_class, acl, transaction);
 	}

src/jrd/grant_proto.h

@@ -34,4 +34,3 @@ namespace Jrd
 void GRANT_privileges(Jrd::thread_db*, const Firebird::string&, USHORT, Jrd::jrd_tra*);
 
 #endif // JRD_GRANT_PROTO_H
-

src/jrd/nbak.cpp

@@ -110,6 +110,7 @@ void NBackupStateLock::blockingAstHandler(thread_db* tdbb)
 		CCH_flush_ast(tdbb);
 		NBAK_TRACE_AST(("database FLUSHED"));
 	}
+
 	GlobalRWLock::blockingAstHandler(tdbb);
 
 	if (wasWrite && (cachedLock->lck_physical == LCK_read))
@@ -170,7 +171,9 @@ void BackupManager::openDelta()
 {
 	fb_assert(!diff_file);
 	diff_file = PIO_open(database, diff_name, diff_name, false);
-	if (database->dbb_flags & (DBB_force_write | DBB_no_fs_cache)) {
+
+	if (database->dbb_flags & (DBB_force_write | DBB_no_fs_cache))
+	{
 		PIO_force_write(diff_file,
 			database->dbb_flags & DBB_force_write,
 			database->dbb_flags & DBB_no_fs_cache);
@@ -213,11 +216,14 @@ void BackupManager::beginBackup(thread_db* tdbb)
 		// Create file
 		NBAK_TRACE(("Creating difference file %s", diff_name.c_str()));
 		diff_file = PIO_create(database, diff_name, true, false, false);
-		if (database->dbb_flags & (DBB_force_write | DBB_no_fs_cache)) {
+
+		if (database->dbb_flags & (DBB_force_write | DBB_no_fs_cache))
+		{
 			PIO_force_write(diff_file,
 				database->dbb_flags & DBB_force_write,
 				database->dbb_flags & DBB_no_fs_cache);
 		}
+
 #ifdef UNIX
 		// adjust difference file access rights to make it match main DB ones
 		if (diff_file && geteuid() == 0)
@@ -240,6 +246,7 @@ void BackupManager::beginBackup(thread_db* tdbb)
 			}
 		}
 #endif
+
 		// Zero out first page (empty allocation table)
 		BufferDesc temp_bdb;
 		temp_bdb.bdb_page = 0;

src/jrd/pcmet_proto.h

@@ -37,4 +37,3 @@ void PCMET_expression_index(Jrd::thread_db*, const Firebird::string&, USHORT, Jr
 void PCMET_lookup_index(Jrd::thread_db*, Jrd::jrd_rel*, Jrd::index_desc*);
 
 #endif // JRD_PCMET_PROTO_H
-

src/jrd/que.h

@@ -38,7 +38,6 @@ struct que
 typedef que* QUE;
 
 
-
 inline void QUE_INIT(que& aque)
 {
 	aque.que_backward = &aque;
@@ -140,4 +139,3 @@ typedef srq *SRQ;
 
 
 #endif /* JRD_QUE_H */
-

src/lock/lock.cpp

@@ -1248,7 +1248,7 @@ UCHAR* LockManager::alloc(USHORT size, ISC_STATUS* status_vector)
 	if (m_header->lhb_used + size > m_header->lhb_length)
 	{
 #ifdef USE_SHMEM_EXT
-		// round up so next object starts at beginngin of next extent
+		// round up so next object starts at beginning of next extent
 		block = m_header->lhb_used = m_header->lhb_length;
 		if (newExtent())
 		{

src/lock/reset.cpp

@@ -39,4 +39,3 @@ int main( int argc, char **argv)
 		return;
 	return semctl(semid, 0, IPC_RMID, 0);
 }
-