From 6f2731d3f30b53ba28380dcf3ff3c19292e523ad Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Tue, 7 Jul 2015 16:36:49 +0200
Subject: [PATCH] Style.

---
 libdevcore/Base64.cpp | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/libdevcore/Base64.cpp b/libdevcore/Base64.cpp
index f97c82156..8ee2b29f7 100644
--- a/libdevcore/Base64.cpp
+++ b/libdevcore/Base64.cpp
@@ -27,6 +27,8 @@
 /// Originally by René Nyffenegger, modified by some other guy and then devified by Gav Wood.
 
 #include "Base64.h"
+
+using namespace std;
 using namespace dev;
 
 static inline bool is_base64(byte c)
@@ -44,14 +46,14 @@ static inline byte find_base64_char_index(byte c)
 	else return 1 + find_base64_char_index('/');
 }
 
-std::string dev::toBase64(bytesConstRef _in)
+string dev::toBase64(bytesConstRef _in)
 {
 	static const char base64_chars[] =
-			"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-			"abcdefghijklmnopqrstuvwxyz"
-			"0123456789+/";
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+		"abcdefghijklmnopqrstuvwxyz"
+		"0123456789+/";
 
-	std::string ret;
+	string ret;
 	int i = 0;
 	int j = 0;
 	byte char_array_3[3];
@@ -60,15 +62,17 @@ std::string dev::toBase64(bytesConstRef _in)
 	auto buf = _in.data();
 	auto bufLen = _in.size();
 
-	while (bufLen--) {
+	while (bufLen--)
+	{
 		char_array_3[i++] = *(buf++);
-		if (i == 3) {
+		if (i == 3)
+		{
 			char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
 			char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
 			char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
 			char_array_4[3] = char_array_3[2] & 0x3f;
 
-			for(i = 0; (i <4) ; i++)
+			for (i = 0; i < 4; i++)
 				ret += base64_chars[char_array_4[i]];
 			i = 0;
 		}
@@ -76,7 +80,7 @@ std::string dev::toBase64(bytesConstRef _in)
 
 	if (i)
 	{
-		for(j = i; j < 3; j++)
+		for (j = i; j < 3; j++)
 			char_array_3[j] = '\0';
 
 		char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
@@ -84,28 +88,31 @@ std::string dev::toBase64(bytesConstRef _in)
 		char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
 		char_array_4[3] = char_array_3[2] & 0x3f;
 
-		for (j = 0; (j < i + 1); j++)
+		for (j = 0; j < i + 1; j++)
 			ret += base64_chars[char_array_4[j]];
 
-		while((i++ < 3))
+		while (i++ < 3)
 			ret += '=';
 	}
 
 	return ret;
 }
 
-bytes dev::fromBase64(std::string const& encoded_string)
+bytes dev::fromBase64(string const& encoded_string)
 {
 	auto in_len = encoded_string.size();
 	int i = 0;
 	int j = 0;
 	int in_ = 0;
-	byte char_array_4[4], char_array_3[3];
+	byte char_array_3[3];
+	byte char_array_4[4];
 	bytes ret;
 
-	while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
+	while (in_len-- && encoded_string[in_] != '=' && is_base64(encoded_string[in_]))
+	{
 		char_array_4[i++] = encoded_string[in_]; in_++;
-		if (i == 4) {
+		if (i == 4)
+		{
 			for (i = 0; i < 4; i++)
 				char_array_4[i] = find_base64_char_index(char_array_4[i]);
 
@@ -119,7 +126,8 @@ bytes dev::fromBase64(std::string const& encoded_string)
 		}
 	}
 
-	if (i) {
+	if (i)
+	{
 		for (j = i; j < 4; j++)
 			char_array_4[j] = 0;
 
@@ -130,7 +138,8 @@ bytes dev::fromBase64(std::string const& encoded_string)
 		char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
 		char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
 
-		for (j = 0; (j < i - 1); j++) ret.push_back(char_array_3[j]);
+		for (j = 0; j < i - 1; j++)
+			ret.push_back(char_array_3[j]);
 	}
 
 	return ret;