Formatting/Whitespace Cleanup

Various fixes to formatting and whitespace

1 files changed, 46 insertions, 35 deletions

diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp
index 7efc4549d7..4aeb802336 100644
--- a/Source/Core/Common/Hash.cpp
+++ b/Source/Core/Common/Hash.cpp
@@ -24,11 +24,11 @@ u32 HashFletcher(const u8* data_u8, size_t length)
 		size_t tlen = len > 360 ? 360 : len;
 		len -= tlen;
 
-		do {
+		do
+		{
 			sum1 += *data++;
 			sum2 += sum1;
-		}
-		while (--tlen);
+		} while (--tlen);
 
 		sum1 = (sum1 & 0xffff) + (sum1 >> 16);
 		sum2 = (sum2 & 0xffff) + (sum2 >> 16);
@@ -58,8 +58,7 @@ u32 HashAdler32(const u8* data, size_t len)
 		{
 			a += *data++;
 			b += a;
-		}
-		while (--tlen);
+		} while (--tlen);
 
 		a = (a & 0xffff) + (a >> 16) * (65536 - MOD_ADLER);
 		b = (b & 0xffff) + (b >> 16) * (65536 - MOD_ADLER);
@@ -115,24 +114,24 @@ inline u64 getblock(const u64 * p, int i)
 inline void bmix64(u64 & h1, u64 & h2, u64 & k1, u64 & k2, u64 & c1, u64 & c2)
 {
 	k1 *= c1;
-	k1  = _rotl64(k1,23);
+	k1  = _rotl64(k1, 23);
 	k1 *= c2;
 	h1 ^= k1;
 	h1 += h2;
 
-	h2 = _rotl64(h2,41);
+	h2  = _rotl64(h2, 41);
 
 	k2 *= c2;
-	k2  = _rotl64(k2,23);
+	k2  = _rotl64(k2, 23);
 	k2 *= c1;
 	h2 ^= k2;
 	h2 += h1;
 
-	h1 = h1*3+0x52dce729;
-	h2 = h2*3+0x38495ab5;
+	h1 = h1 * 3 + 0x52dce729;
+	h2 = h2 * 3 + 0x38495ab5;
 
-	c1 = c1*5+0x7b7d159c;
-	c2 = c2*5+0x6bce6396;
+	c1 = c1 * 5 + 0x7b7d159c;
+	c2 = c2 * 5 + 0x6bce6396;
 }
 
 //----------
@@ -154,9 +153,11 @@ u64 GetMurmurHash3(const u8 *src, u32 len, u32 samples)
 	const u8 * data = (const u8*)src;
 	const int nblocks = len / 16;
 	u32 Step = (len / 8);
-	if (samples == 0) samples = std::max(Step, 1u);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
 	Step = Step / samples;
-	if (Step < 1) Step = 1;
+	if (Step < 1)
+		Step = 1;
 
 	u64 h1 = 0x9368e53c2f6af274;
 	u64 h2 = 0x586dcd208f7cd3fd;
@@ -172,8 +173,8 @@ u64 GetMurmurHash3(const u8 *src, u32 len, u32 samples)
 
 	for (int i = 0; i < nblocks; i+=Step)
 	{
-		u64 k1 = getblock(blocks,i*2+0);
-		u64 k2 = getblock(blocks,i*2+1);
+		u64 k1 = getblock(blocks, i*2+0);
+		u64 k2 = getblock(blocks, i*2+1);
 
 		bmix64(h1,h2,k1,k2,c1,c2);
 	}
@@ -232,9 +233,11 @@ u64 GetCRC32(const u8 *src, u32 len, u32 samples)
 	u32 Step = (len / 8);
 	const u64 *data = (const u64 *)src;
 	const u64 *end = data + Step;
-	if (samples == 0) samples = std::max(Step, 1u);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
 	Step = Step / samples;
-	if (Step < 1) Step = 1;
+	if (Step < 1)
+		Step = 1;
 	while (data < end - Step * 3)
 	{
 		h[0] = _mm_crc32_u64(h[0], data[Step * 0]);
@@ -280,9 +283,11 @@ u64 GetHashHiresTexture(const u8 *src, u32 len, u32 samples)
 	u32 Step = (len / 8);
 	const u64 *data = (const u64 *)src;
 	const u64 *end = data + Step;
-	if (samples == 0) samples = std::max(Step, 1u);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
 	Step = Step / samples;
-	if (Step < 1) Step = 1;
+	if (Step < 1)
+		Step = 1;
 	while (data < end)
 	{
 		u64 k = data[0];
@@ -323,9 +328,11 @@ u64 GetCRC32(const u8 *src, u32 len, u32 samples)
 	u32 Step = (len/4);
 	const u32 *data = (const u32 *)src;
 	const u32 *end = data + Step;
-	if (samples == 0) samples = std::max(Step, 1u);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
 	Step  = Step / samples;
-	if (Step < 1) Step = 1;
+	if (Step < 1)
+		Step = 1;
 	while (data < end)
 	{
 		h = _mm_crc32_u32(h, data[0]);
@@ -367,24 +374,24 @@ inline u32 fmix32(u32 h)
 inline void bmix32(u32 & h1, u32 & h2, u32 & k1, u32 & k2, u32 & c1, u32 & c2)
 {
 	k1 *= c1;
-	k1  = _rotl(k1,11);
+	k1  = _rotl(k1, 11);
 	k1 *= c2;
 	h1 ^= k1;
 	h1 += h2;
 
-	h2 = _rotl(h2,17);
+	h2  = _rotl(h2, 17);
 
 	k2 *= c2;
-	k2  = _rotl(k2,11);
+	k2  = _rotl(k2, 11);
 	k2 *= c1;
 	h2 ^= k2;
 	h2 += h1;
 
-	h1 = h1*3+0x52dce729;
-	h2 = h2*3+0x38495ab5;
+	h1  = h1*3+0x52dce729;
+	h2  = h2*3+0x38495ab5;
 
-	c1 = c1*5+0x7b7d159c;
-	c2 = c2*5+0x6bce6396;
+	c1  = c1*5+0x7b7d159c;
+	c2  = c2*5+0x6bce6396;
 }
 
 //----------
@@ -395,9 +402,11 @@ u64 GetMurmurHash3(const u8* src, u32 len, u32 samples)
 	u32 out[2];
 	const int nblocks = len / 8;
 	u32 Step = (len / 4);
-	if (samples == 0) samples = std::max(Step, 1u);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
 	Step = Step / samples;
-	if (Step < 1) Step = 1;
+	if (Step < 1)
+		Step = 1;
 
 	u32 h1 = 0x8de1c3ac;
 	u32 h2 = 0xbab98226;
@@ -446,8 +455,8 @@ u64 GetMurmurHash3(const u8* src, u32 len, u32 samples)
 	h1 += h2;
 	h2 += h1;
 
-	h1 = fmix32(h1);
-	h2 = fmix32(h2);
+	h1  = fmix32(h1);
+	h2  = fmix32(h2);
 
 	h1 += h2;
 	h2 += h1;
@@ -471,9 +480,11 @@ u64 GetHashHiresTexture(const u8 *src, u32 len, u32 samples)
 	u32 Step = (len / 8);
 	const u64 *data = (const u64 *)src;
 	const u64 *end = data + Step;
-	if (samples == 0) samples = std::max(Step, 1u);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
 	Step = Step / samples;
-	if (Step < 1) Step = 1;
+	if (Step < 1)
+		Step = 1;
 	while (data < end)
 	{
 		u64 k = data[0];