Misc.

doc/README.trusted_authentication

@@ -8,7 +8,7 @@ firebird.conf and tune mappings in your databases.
 Parameter Authentication in firebird.conf file is not used any more - it's replaced with more
 generic AuthServer (and AuthClient) parameters. Also to use trusted authentication one should turn
 off mandatory wire encryption because Win_Sspi plugin (which implements trusted authentication on
-windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
+Windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
 
 AuthServer = Srp, Win_Sspi
 WireCrypt = Enabled

src/burp/burp.cpp

@@ -127,7 +127,7 @@ struct StatFormat
 	char width;
 };
 static const char* STAT_CHARS = "TDRW";
-static const StatFormat STAT_FORMATS[] = 
+static const StatFormat STAT_FORMATS[] =
 {
 	{"time",	"%4lu.%03u ",  9},
 	{"delta",	"%2lu.%03u ",  7},
@@ -838,25 +838,29 @@ int gbak(Firebird::UtilSvc* uSvc)
 		case IN_SW_BURP_STATS:
 			if (tdgbl->gbl_stat_flags)
 				BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
-			if (++itr >= argc)
-					BURP_error(366, true); // statistics parameter missing
 
-			{
+			if (++itr >= argc)
+				BURP_error(366, true); // statistics parameter missing
+
+			{	// scope
 				const char* perf_val = argv[itr];
 				const char* c = perf_val;
 				size_t len = strlen(STAT_CHARS);
+
 				for (; *c && len; c++, len--)
 				{
 					const char* pos = strchr(STAT_CHARS, toupper(*c));
 					if (!pos)
-						BURP_error(367, true, SafeArg() << *c); // wrong char "@1" at statistics parameter 
+						BURP_error(367, true, SafeArg() << *c); // wrong char "@1" at statistics parameter
 
 					tdgbl->gbl_stat_flags |= 1 << (pos - STAT_CHARS);
 				}
+
 				if (*c)
-					BURP_error(368, true); // 'too many chars at statistics parameter'
+					BURP_error(368, true); // too many chars at statistics parameter
 			}
 			break;
+
 		case IN_SW_BURP_CO:
 			if (tdgbl->gbl_sw_convert_ext_tables)
 				BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
@@ -2461,7 +2465,7 @@ void BurpGlobals::read_stats(SINT64* stats)
 
 	isc_database_info(status, &db_handle, sizeof(info), info, sizeof(buffer), buffer);
 
-	char *p = buffer, *const e = buffer + sizeof(buffer);
+	char* p = buffer, *const e = buffer + sizeof(buffer);
 	while (p < e)
 	{
 		int flag = -1;
@@ -2483,7 +2487,7 @@ void BurpGlobals::read_stats(SINT64* stats)
 		if (flag != -1)
 		{
 			const int len = isc_vax_integer(p + 1, 2);
-			stats[flag] = isc_portable_integer((ISC_UCHAR*)p + 1 + 2, len);
+			stats[flag] = isc_portable_integer((ISC_UCHAR*) p + 1 + 2, len);
 			p += len + 3;
 		}
 	}
@@ -2559,6 +2563,7 @@ void BurpGlobals::print_stats_header()
 		if (gbl_stat_flags & (1 << i))
 			burp_output(false, "%-*s", STAT_FORMATS[i].width, STAT_FORMATS[i].header);
 	}
+
 	burp_output(false, "\n");
 }
 

src/common/classes/SyncObject.cpp

@@ -73,7 +73,7 @@ bool SyncObject::lock(Sync* sync, SyncType type, const char* from, int timeOut)
 		++waiters;
 
 		//while (true)
-		while (!waitingThreads)	// fair locking 
+		while (!waitingThreads)	// fair locking
 		{
 			const AtomicCounter::counter_type oldState = lockState;
 			if (oldState < 0)

src/isql/isql.epp

@@ -880,6 +880,7 @@ static void readNextInputLine(const char* prompt)
 	{
 		// Read the line
 		char buffer[MAX_USHORT];
+
 		if (fgets(buffer, sizeof(buffer), Filelist->Ifp().indev_fpointer) != NULL)
 		{
 			size_t lineSize = strlen(buffer);
@@ -5961,7 +5962,9 @@ static bool printUser(const char* dbName)
 			txt.assign(v.value.asVary->vary_string, v.value.asVary->vary_length);
 			break;
 		}
+
 		txt.trim();
+
 		if (fieldInfo[i].skip && txt == fieldInfo[i].skip)
 			continue;
 
@@ -5971,6 +5974,7 @@ static bool printUser(const char* dbName)
 
 	if (wasOut)
 		isqlGlob.printf("%s", NEWLINE);
+
 	return true;
 }
 

src/jrd/validation.h

@@ -163,7 +163,7 @@ private:
 		explicit UsedBdb(BufferDesc* _bdb) : bdb(_bdb), count(1) {}
 
 		BufferDesc* bdb;
-		int  count;
+		int count;
 
 		static const ULONG generate(const UsedBdb& p)
 		{
@@ -179,7 +179,6 @@ private:
 
 	UsedBdbs vdr_used_bdbs;
 
-
 	void cleanup();
 	RTN corrupt(int, const jrd_rel*, ...);
 	FETCH_CODE fetch_page(bool validate, ULONG, USHORT, WIN*, void*);

src/yvalve/utl.cpp

@@ -1038,7 +1038,7 @@ public:
 	}
 
 private:
-	ClumpletWriter *pb;
+	ClumpletWriter* pb;
 	unsigned char nextTag;
 	string strVal;
 };