1 files changed, 49 insertions, 39 deletions

diff --git a/src/base64.c b/src/base64.c
index 986201e..636874e 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,6 +1,7 @@
 #include "base64.h"
-#include "stralloc.h"
+
 #include "str.h"
+#include "stralloc.h"
 
 /**
 	@file base64.c
@@ -9,13 +10,12 @@
 	@brief base64 en+decoding of strings
 */
 
-static char *b64alpha =
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static char *b64alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 #define B64PAD '='
 
 /* returns 0 ok, 1 illegal, -1 problem */
 
-int b64decode(const unsigned char *in,int l,stralloc *out)  /* not null terminated */
+int b64decode(const unsigned char *in, int l, stralloc *out) /* not null terminated */
 {
   int p = 0;
   int n;
@@ -25,83 +25,89 @@ int b64decode(const unsigned char *in,int l,stralloc *out)  /* not null terminat
   unsigned char b[3];
 
   if (l == 0) {
-    if (!stralloc_copys(out,"")) return -1;
+    if (!stralloc_copys(out, "")) return -1;
     return 0;
   }
 
-  while (in[l-1] == B64PAD) {
-    p ++;
+  while (in[l - 1] == B64PAD) {
+    p++;
     l--;
   }
 
   n = (l + p) / 4;
   i = (n * 3) - p;
-  if (!stralloc_ready(out,i)) return -1;
+  if (!stralloc_ready(out, i)) return -1;
   out->len = i;
   s = out->s;
 
-  for (i = 0; i < n - 1 ; i++) {
+  for (i = 0; i < n - 1; i++) {
     x = 0;
     for (j = 0; j < 4; j++) {
-      if(in[j] >= 'A' && in[j] <= 'Z')
+      if (in[j] >= 'A' && in[j] <= 'Z')
         x = (x << 6) + (unsigned int)(in[j] - 'A' + 0);
-      else if(in[j] >= 'a' && in[j] <= 'z')
+      else if (in[j] >= 'a' && in[j] <= 'z')
         x = (x << 6) + (unsigned int)(in[j] - 'a' + 26);
-      else if(in[j] >= '0' && in[j] <= '9')
+      else if (in[j] >= '0' && in[j] <= '9')
         x = (x << 6) + (unsigned int)(in[j] - '0' + 52);
-      else if(in[j] == '+')
+      else if (in[j] == '+')
         x = (x << 6) + 62;
-      else if(in[j] == '/')
+      else if (in[j] == '/')
         x = (x << 6) + 63;
-      else if(in[j] == '=')
+      else if (in[j] == '=')
         x = (x << 6);
     }
 
-    s[2] = (unsigned char)(x & 255); x >>= 8;
-    s[1] = (unsigned char)(x & 255); x >>= 8;
-    s[0] = (unsigned char)(x & 255); x >>= 8;
-    s += 3; in += 4;
+    s[2] = (unsigned char)(x & 255);
+    x >>= 8;
+    s[1] = (unsigned char)(x & 255);
+    x >>= 8;
+    s[0] = (unsigned char)(x & 255);
+    x >>= 8;
+    s += 3;
+    in += 4;
   }
 
   x = 0;
   for (j = 0; j < 4; j++) {
-    if(in[j] >= 'A' && in[j] <= 'Z')
+    if (in[j] >= 'A' && in[j] <= 'Z')
       x = (x << 6) + (unsigned int)(in[j] - 'A' + 0);
-    else if(in[j] >= 'a' && in[j] <= 'z')
+    else if (in[j] >= 'a' && in[j] <= 'z')
       x = (x << 6) + (unsigned int)(in[j] - 'a' + 26);
-    else if(in[j] >= '0' && in[j] <= '9')
+    else if (in[j] >= '0' && in[j] <= '9')
       x = (x << 6) + (unsigned int)(in[j] - '0' + 52);
-    else if(in[j] == '+')
+    else if (in[j] == '+')
       x = (x << 6) + 62;
-    else if(in[j] == '/')
+    else if (in[j] == '/')
       x = (x << 6) + 63;
-    else if(in[j] == '=')
+    else if (in[j] == '=')
       x = (x << 6);
   }
 
-  b[2] = (unsigned char)(x & 255); x >>= 8;
-  b[1] = (unsigned char)(x & 255); x >>= 8;
-  b[0] = (unsigned char)(x & 255); x >>= 8;
+  b[2] = (unsigned char)(x & 255);
+  x >>= 8;
+  b[1] = (unsigned char)(x & 255);
+  x >>= 8;
+  b[0] = (unsigned char)(x & 255);
+  x >>= 8;
 
-  for (i = 0; i < 3 - p; i++)
-    s[i] = b[i];
+  for (i = 0; i < 3 - p; i++) s[i] = b[i];
 
   return 0;
 }
 
-int b64encode(stralloc *in,stralloc *out) /* not null terminated */
+int b64encode(stralloc *in, stralloc *out) /* not null terminated */
 {
   unsigned char a, b, c;
   int i;
   char *s;
 
   if (in->len == 0) {
-    if (!stralloc_copys(out,"")) return -1;
+    if (!stralloc_copys(out, "")) return -1;
     return 0;
   }
 
-  i = in->len / 3 * 4 + 4;   
-  if (!stralloc_ready(out,i)) return -1;
+  i = in->len / 3 * 4 + 4;
+  if (!stralloc_ready(out, i)) return -1;
   s = out->s;
 
   for (i = 0; i < in->len; i += 3) {
@@ -110,13 +116,17 @@ int b64encode(stralloc *in,stralloc *out) /* not null terminated */
     c = i + 2 < in->len ? in->s[i + 2] : 0;
 
     *s++ = b64alpha[a >> 2];
-    *s++ = b64alpha[((a & 3 ) << 4) | (b >> 4)];
+    *s++ = b64alpha[((a & 3) << 4) | (b >> 4)];
 
-    if (i + 1 >= in->len) *s++ = B64PAD;
-    else *s++ = b64alpha[((b & 15) << 2) | (c >> 6)];
+    if (i + 1 >= in->len)
+      *s++ = B64PAD;
+    else
+      *s++ = b64alpha[((b & 15) << 2) | (c >> 6)];
 
-    if (i + 2 >= in->len) *s++ = B64PAD;
-    else *s++ = b64alpha[c & 63];
+    if (i + 2 >= in->len)
+      *s++ = B64PAD;
+    else
+      *s++ = b64alpha[c & 63];
   }
   out->len = s - out->s;