From 00c059d4554f70fc52d94ff1d5dd28976bf857fb Mon Sep 17 00:00:00 2001
From: tomsmeding <tom.smeding@gmail.com>
Date: Sat, 8 Oct 2016 13:46:59 +0200
Subject: Code cleanup

---
 base64.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'base64.cpp')

diff --git a/base64.cpp b/base64.cpp
index 80640f2..7e0524a 100644
--- a/base64.cpp
+++ b/base64.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include "base64.h"
 
 using namespace std;
@@ -25,7 +26,7 @@ namespace Base64{
 		string res(4*blocks+4*(sz%3!=0),'\0');
 		int x;
 		for(int i=0;i<blocks;i++){
-			x=((unsigned char)data[3*i]<<16)|((unsigned char)data[3*i+1]<<8)|(unsigned char)data[3*i+2];
+			x=((uint8_t)data[3*i]<<16)|((uint8_t)data[3*i+1]<<8)|(uint8_t)data[3*i+2];
 			res[4*i+3]=alphabet[x&0x3f]; x>>=6;
 			res[4*i+2]=alphabet[x&0x3f]; x>>=6;
 			res[4*i+1]=alphabet[x&0x3f]; x>>=6;
@@ -33,16 +34,16 @@ namespace Base64{
 		}
 		switch(sz%3){
 			case 1:
-				res[4*blocks+0]=alphabet[(unsigned char)data[3*blocks]>>2];
-				res[4*blocks+1]=alphabet[((unsigned char)data[3*blocks]&0x3)<<4];
+				res[4*blocks+0]=alphabet[(uint8_t)data[3*blocks]>>2];
+				res[4*blocks+1]=alphabet[((uint8_t)data[3*blocks]&0x3)<<4];
 				res[4*blocks+2]='=';
 				res[4*blocks+3]='=';
 				break;
 
 			case 2:
-				res[4*blocks+0]=alphabet[(unsigned char)data[3*blocks]>>2];
-				res[4*blocks+1]=alphabet[(((unsigned char)data[3*blocks]&0x3)<<4)|((unsigned char)data[3*blocks+1]>>4)];
-				res[4*blocks+2]=alphabet[(((unsigned char)data[3*blocks+1]&0xf)<<2)];
+				res[4*blocks+0]=alphabet[(uint8_t)data[3*blocks]>>2];
+				res[4*blocks+1]=alphabet[(((uint8_t)data[3*blocks]&0x3)<<4)|((uint8_t)data[3*blocks+1]>>4)];
+				res[4*blocks+2]=alphabet[(((uint8_t)data[3*blocks+1]&0xf)<<2)];
 				res[4*blocks+3]='=';
 				break;
 		}
-- 
cgit v1.2.3-70-g09d2