Misc.

builds/install/arch-specific/win32/installation_readme.txt

@@ -111,7 +111,7 @@ o Be sure to install as an administrator. ie, if
 o Libraries deployed by instclient may fail to load if
   the MS runtime libraries have not been installed. 
   This may be a problem if installing on older Windows
-  platforms. 
+  platforms.
 
 
 Uninstallation

examples/dbcrypt/CryptKeyHolder.cpp

@@ -164,7 +164,7 @@ private:
 	class NamedCallback : public ICryptKeyCallbackImpl<NamedCallback, CheckStatusWrapper>
 	{
 	public:
-		NamedCallback(NamedCallback *n, const char* nm, UCHAR k)
+		NamedCallback(NamedCallback* n, const char* nm, UCHAR k)
 			: next(n), key(k)
 		{
 			strncpy(name, nm, sizeof(name));

examples/dbcrypt/DbCrypt.cpp

@@ -154,7 +154,7 @@ void DbCrypt::noKeyError(CheckStatusWrapper* status)
 	vector[0] = isc_arg_gds;
 	vector[1] = isc_random;
 	vector[2] = isc_arg_string;
-	vector[3] = (ISC_STATUS)msg;
+	vector[3] = (ISC_STATUS) msg;
 	vector[4] = isc_arg_end;
 	status->setErrors(vector);
 }
@@ -205,7 +205,7 @@ void DbCrypt::setKey(CheckStatusWrapper* status, unsigned int length, IKeyHolder
 	if (key != 0)
 		return;
 
-	strncpy(savedKeyName, keyName ? keyName : "", sizeof(savedKeyName));
+	strncpy(savedKeyName, (keyName ? keyName : ""), sizeof(savedKeyName));
 	savedKeyName[sizeof(savedKeyName) - 1] = 0;
 
 	IConfig* def = config->getDefaultConfig(status);

src/dsql/parse.y

@@ -3480,7 +3480,7 @@ trigger_active
 		{ $$ = Nullable<bool>::val(true); }
 	| INACTIVE
 		{ $$ = Nullable<bool>::val(false); }
-	|
+	| // nothing
 		{ $$ = Nullable<bool>::empty(); }
 	;
 
@@ -3976,9 +3976,8 @@ db_alter_clause($alterDatabaseNode)
 
 %type crypt_key_clause(<alterDatabaseNode>)
 crypt_key_clause($alterDatabaseNode)
-	:  /* nothing */
-	| KEY valid_symbol_name
-		{ $alterDatabaseNode->keyName = *$2; }
+	: // nothing
+	| KEY valid_symbol_name		{ $alterDatabaseNode->keyName = *$2; }
 	;
 
 // ALTER TRIGGER

src/jrd/CryptoManager.cpp

@@ -416,7 +416,7 @@ namespace Jrd {
 		if (sv->getState() & IStatus::STATE_ERRORS)
 			Arg::StatusVector(&sv).raise();
 
-		// calculate it's hash
+		// calculate its hash
 		const string verifier(result, sizeof(result));
 		Sha1::hashBased64(valid, verifier);
 	}

src/jrd/cch.cpp

@@ -4892,7 +4892,7 @@ static bool write_page(thread_db* tdbb, BufferDesc* bdb, FbStatusVector* const s
 
 					bool callback(thread_db* tdbb, FbStatusVector* status, Ods::pag* page)
 					{
-						Database *dbb = tdbb->getDatabase();
+						Database* dbb = tdbb->getDatabase();
 
 						while (!PIO_write(tdbb, file, bdb, page, status))
 						{
@@ -4925,7 +4925,7 @@ static bool write_page(thread_db* tdbb, BufferDesc* bdb, FbStatusVector* const s
 
 				Pio io(pageSpace->file, bdb, inAst, isTempPage, pageSpace);
 				result = dbb->dbb_crypto_manager->write(tdbb, status, page, &io);
-				if ((!result) && (bdb->bdb_flags & BDB_io_error))
+				if (!result && (bdb->bdb_flags & BDB_io_error))
 				{
 					return false;
 				}

src/jrd/extds/InternalDS.cpp

@@ -160,7 +160,7 @@ void InternalConnection::attach(thread_db* tdbb, const PathName& dbName,
 		m_dbName = dbb->dbb_database_name.c_str();
 		generateDPB(tdbb, m_dpb, user, pwd, role);
 
-		// Avoid change of m_dpb by validatePassword() below 
+		// Avoid change of m_dpb by validatePassword() below
 		ClumpletWriter newDpb(m_dpb);
 		validatePassword(tdbb, m_dbName, newDpb);
 

src/jrd/extds/IscDS.cpp

@@ -117,7 +117,7 @@ void IscConnection::attach(thread_db* tdbb, const PathName& dbName, const string
 	m_dbName = dbName;
 	generateDPB(tdbb, m_dpb, user, pwd, role);
 
-	// Avoid change of m_dpb by validatePassword() below 
+	// Avoid change of m_dpb by validatePassword() below
 	ClumpletWriter newDpb(m_dpb);
 	validatePassword(tdbb, m_dbName, newDpb);
 

src/jrd/nbak.cpp

@@ -822,10 +822,12 @@ bool BackupManager::writeDifference(thread_db* tdbb, FbStatusVector* status, ULO
 		{
 			return PIO_write(tdbb, file, bdb, page, sv);
 		}
+
 	private:
 		jrd_file* file;
 		BufferDesc* bdb;
 	};
+
 	Pio io(diff_file, &temp_bdb);
 
 	if (!database->dbb_crypto_manager->write(tdbb, status, page, &io))
@@ -850,10 +852,12 @@ bool BackupManager::readDifference(thread_db* tdbb, ULONG diff_page, Ods::pag* p
 		{
 			return PIO_read(tdbb, file, bdb, page, sv);
 		}
+
 	private:
 		jrd_file* file;
 		BufferDesc* bdb;
 	};
+
 	Pio io(diff_file, &temp_bdb);
 
 	if (!database->dbb_crypto_manager->read(tdbb, tdbb->tdbb_status_vector, page, &io))

src/jrd/sdw.cpp

@@ -514,10 +514,11 @@ void SDW_dump_pages(thread_db* tdbb)
 					Shadow* shadow;
 					BufferDesc* bdb;
 				};
+
 				Pio cryptIo(shadow, window.win_bdb);
 
 				if (!dbb->dbb_crypto_manager->write(tdbb, tdbb->tdbb_status_vector,
-					window.win_bdb->bdb_buffer, &cryptIo))
+						window.win_bdb->bdb_buffer, &cryptIo))
 				{
 					CCH_RELEASE(tdbb, &window);
 					ERR_punt();

src/jrd/vio.cpp

@@ -2266,7 +2266,7 @@ bool VIO_get_current(thread_db* tdbb,
 		case tra_committed:
 			return !(rpb->rpb_flags & rpb_deleted);
 		case tra_dead:
-			// Run backout else false key violation could be reported, see CORE-5110
+			// Run backout otherwise false key violation could be reported, see CORE-5110
 			//
 			// if (transaction->tra_attachment->att_flags & ATT_no_cleanup)
 			//	return !foreign_key;