1 files changed, 81 insertions, 82 deletions
diff --git a/src/mongo/util/base64.cpp b/src/mongo/util/base64.cpp
index 961e43ed113..6938b318148 100644
--- a/src/mongo/util/base64.cpp
+++ b/src/mongo/util/base64.cpp
@@ -34,98 +34,97 @@
 
 namespace mongo {
 
-    using std::string;
-    using std::stringstream;
-
-    namespace base64 {
-
-        Alphabet alphabet;
-
-        void encode( stringstream& ss , const char * data , int size ) {
-            for ( int i=0; i<size; i+=3 ) {
-                int left = size - i;
-                const unsigned char * start = (const unsigned char*)data + i;
-
-                // byte 0
-                ss << alphabet.e(start[0]>>2);
-
-                // byte 1
-                unsigned char temp = ( start[0] << 4 );
-                if ( left == 1 ) {
-                    ss << alphabet.e(temp);
-                    break;
-                }
-                temp |= ( ( start[1] >> 4 ) & 0xF );
-                ss << alphabet.e(temp);
-
-                // byte 2
-                temp = ( start[1] & 0xF ) << 2;
-                if ( left == 2 ) {
-                    ss << alphabet.e(temp);
-                    break;
-                }
-                temp |= ( ( start[2] >> 6 ) & 0x3 );
-                ss << alphabet.e(temp);
-
-                // byte 3
-                ss << alphabet.e(start[2] & 0x3f);
-            }
+using std::string;
+using std::stringstream;
 
-            int mod = size % 3;
-            if ( mod == 1 ) {
-                ss << "==";
-            }
-            else if ( mod == 2 ) {
-                ss << "=";
-            }
-        }
+namespace base64 {
 
+Alphabet alphabet;
 
-        string encode( const char * data , int size ) {
-            stringstream ss;
-            encode( ss , data ,size );
-            return ss.str();
-        }
+void encode(stringstream& ss, const char* data, int size) {
+    for (int i = 0; i < size; i += 3) {
+        int left = size - i;
+        const unsigned char* start = (const unsigned char*)data + i;
+
+        // byte 0
+        ss << alphabet.e(start[0] >> 2);
 
-        string encode( const string& s ) {
-            return encode( s.c_str() , s.size() );
+        // byte 1
+        unsigned char temp = (start[0] << 4);
+        if (left == 1) {
+            ss << alphabet.e(temp);
+            break;
         }
+        temp |= ((start[1] >> 4) & 0xF);
+        ss << alphabet.e(temp);
+
+        // byte 2
+        temp = (start[1] & 0xF) << 2;
+        if (left == 2) {
+            ss << alphabet.e(temp);
+            break;
+        }
+        temp |= ((start[2] >> 6) & 0x3);
+        ss << alphabet.e(temp);
 
+        // byte 3
+        ss << alphabet.e(start[2] & 0x3f);
+    }
 
-        void decode( stringstream& ss , const string& s ) {
-            uassert( 10270 ,  "invalid base64" , s.size() % 4 == 0 );
-            const unsigned char * data = (const unsigned char*)s.c_str();
-            int size = s.size();
-
-            unsigned char buf[3];
-            for ( int i=0; i<size; i+=4) {
-                const unsigned char * start = data + i;
-                buf[0] = ( ( alphabet.decode[start[0]] << 2 ) & 0xFC ) | ( ( alphabet.decode[start[1]] >> 4 ) & 0x3 );
-                buf[1] = ( ( alphabet.decode[start[1]] << 4 ) & 0xF0 ) | ( ( alphabet.decode[start[2]] >> 2 ) & 0xF );
-                buf[2] = ( ( alphabet.decode[start[2]] << 6 ) & 0xC0 ) | ( ( alphabet.decode[start[3]] & 0x3F ) );
-
-                int len = 3;
-                if ( start[3] == '=' ) {
-                    len = 2;
-                    if ( start[2] == '=' ) {
-                        len = 1;
-                    }
-                }
-                ss.write( (const char*)buf , len );
-            }
-        }
+    int mod = size % 3;
+    if (mod == 1) {
+        ss << "==";
+    } else if (mod == 2) {
+        ss << "=";
+    }
+}
 
-        string decode( const string& s ) {
-            stringstream ss;
-            decode( ss , s );
-            return ss.str();
-        }
 
-        const char* chars =
-            "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            "abcdefghijklmnopqrstuvwxyz"
-            "0123456789+/=";
+string encode(const char* data, int size) {
+    stringstream ss;
+    encode(ss, data, size);
+    return ss.str();
+}
+
+string encode(const string& s) {
+    return encode(s.c_str(), s.size());
+}
+
 
+void decode(stringstream& ss, const string& s) {
+    uassert(10270, "invalid base64", s.size() % 4 == 0);
+    const unsigned char* data = (const unsigned char*)s.c_str();
+    int size = s.size();
+
+    unsigned char buf[3];
+    for (int i = 0; i < size; i += 4) {
+        const unsigned char* start = data + i;
+        buf[0] =
+            ((alphabet.decode[start[0]] << 2) & 0xFC) | ((alphabet.decode[start[1]] >> 4) & 0x3);
+        buf[1] =
+            ((alphabet.decode[start[1]] << 4) & 0xF0) | ((alphabet.decode[start[2]] >> 2) & 0xF);
+        buf[2] = ((alphabet.decode[start[2]] << 6) & 0xC0) | ((alphabet.decode[start[3]] & 0x3F));
+
+        int len = 3;
+        if (start[3] == '=') {
+            len = 2;
+            if (start[2] == '=') {
+                len = 1;
+            }
+        }
+        ss.write((const char*)buf, len);
     }
 }
 
+string decode(const string& s) {
+    stringstream ss;
+    decode(ss, s);
+    return ss.str();
+}
+
+const char* chars =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "abcdefghijklmnopqrstuvwxyz"
+    "0123456789+/=";
+}
+}