Misc.

src/isql/show.epp

@@ -458,6 +458,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
 
 		case fb_info_crypt_state:
 			value_out = ISQL_vax_integer(d, length);
+
 			if (translate)
 			{
 				Firebird::string s;
@@ -465,19 +466,24 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
 					IUTILS_msg_get(DATABASE_CRYPTED, msg);
 				else
 					IUTILS_msg_get(DATABASE_NOT_CRYPTED, msg);
+
 				s = msg;
+
 				if (value_out & fb_info_crypt_process)
 				{
 					s += ", ";
 					IUTILS_msg_get(DATABASE_CRYPT_PROCESS, msg);
 					s += msg;
 				}
+
 				sprintf(info, "%s%s", s.c_str(), separator);
 			}
 			else
+			{
 				sprintf(info, "DB %sencrypted%s%s",
-					value_out & fb_info_crypt_encrypted ? "" : "not ",
+					(value_out & fb_info_crypt_encrypted ? "" : "not "),
-					value_out & fb_info_crypt_process ? ", crypt thread not complete" : "", separator);
+					(value_out & fb_info_crypt_process ? ", crypt thread not complete" : "", separator));
+			}
 			break;
 
 		case isc_info_sweep_interval:

src/jrd/CryptoManager.cpp

@@ -509,6 +509,7 @@ namespace Jrd {
 				LCK_release(tdbb, threadLock);
 				return;
 			}
+
 			currentPage = hdr->hdr_crypt_page;
 
 			// Refresh encryption flag

src/jrd/btr.cpp

@@ -1743,13 +1743,12 @@ bool BTR_next_index(thread_db* tdbb, jrd_rel* relation, jrd_tra* transaction, in
 				// clean up this left-over index
 				root = (index_root_page*) CCH_FETCH(tdbb, window, LCK_write, pag_root);
 				irt_desc = root->irt_rpt + id;
+
 				if (irt_desc->getTransaction() == trans)
-				{
 					BTR_delete_index(tdbb, window, id);
-				}
+				else
-				else {
 					CCH_RELEASE(tdbb, window);
-				}
+
 				root = (index_root_page*) CCH_FETCH(tdbb, window, LCK_read, pag_root);
 				continue;
 			}

src/jrd/extds/ValidatePassword.cpp

@@ -45,14 +45,17 @@ public:
 	// ICryptKey implementation
 	void setSymmetric(Firebird::CheckStatusWrapper* status, const char* type, unsigned keyLength, const void* key)
 	{ }
+
 	void setAsymmetric(Firebird::CheckStatusWrapper* status, const char* type, unsigned encryptKeyLength,
 		const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey)
 	{ }
+
 	const void* getEncryptKey(unsigned* length)
 	{
 		*length = 0;
 		return NULL;
 	}
+
 	const void* getDecryptKey(unsigned* length)
 	{
 		*length = 0;
@@ -181,6 +184,7 @@ void validatePassword(thread_db* tdbb, const PathName& file, ClumpletWriter& dpb
 	PathName serverList = config->getPlugins(IPluginManager::TYPE_AUTH_SERVER);
 	PathName clientList = config->getPlugins(IPluginManager::TYPE_AUTH_CLIENT);
 	Auth::mergeLists(list, serverList, clientList);
+
 	if (!list.hasData())
 	{
 		Arg::Gds noPlugins(isc_random);