more base64_encode() tweaking

src/base64.c

@@ -27,6 +27,7 @@
  */
 
 #include <errno.h>
+#include <stdint.h>
 
 #include "base64.h"
 
@@ -59,7 +60,7 @@ base64_encode(const enum encoding enc, char *restrict const buf,
 {
 	const struct b64_alphabet *alpha = &b64_alphabet[enc];
 	char *p = buf;
-	const char *in = inbuf;
+	const uint8_t *in = (uint8_t *)inbuf;
 
 	AN(buf);
 	AN(alpha);
@@ -69,30 +70,28 @@ base64_encode(const enum encoding enc, char *restrict const buf,
 	    || maxlen < base64nopad_encode_l(inlength))
 		return -1;
 
-	while (in < inbuf + inlength) {
-		unsigned char *tmp, idx;
-		size_t rest = (inbuf + inlength) - in;
+	while (in < (uint8_t *)inbuf + inlength) {
+		uint8_t idx;
+		size_t rest = ((uint8_t *)inbuf + inlength) - in;
 
-		tmp = (unsigned char *) in;
+		*p++ = alpha->b64[(in[0] >> 2) & 0x3f];
 
-		*p++ = alpha->b64[(tmp[0] >> 2) & 0x3f];
-
-		idx = (tmp[0] << 4);
+		idx = (in[0] << 4);
 		if (rest > 1)
-			idx += (tmp[1] >> 4);
+			idx += (in[1] >> 4);
 		*p++ = alpha->b64[idx & 0x3f];
 
 		if (rest > 1) {
-			idx = (tmp[1] << 2);
+			idx = (in[1] << 2);
 			if (rest > 2)
-				idx += tmp[2] >> 6;
+				idx += in[2] >> 6;
 			*p++ = alpha->b64[idx & 0x3f];
 		}
 		else if (alpha->padding)
 			*p++ = alpha->padding;
 
 		if (rest > 2)
-			*p++ = alpha->b64[tmp[2] & 0x3f];
+			*p++ = alpha->b64[in[2] & 0x3f];
 		else if (alpha->padding)
 			*p++ = alpha->padding;