Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use uint8_t where appropriate

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2022-09-15 12:22:37 +02:00
parent 857b0b36c0
commit ff8ca7f073
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/stdex/base64.h
View File

@ -6,6 +6,7 @@
#pragma once
#include "sal.h"
#include <cstdint>
#include <string>
#include <vector>
@ -55,7 +56,7 @@ namespace stdex
if (i >= size)
break;
buf[num++] = reinterpret_cast<const unsigned char*>(data)[i];
buf[num++] = reinterpret_cast<const uint8_t*>(data)[i];
}
// If this is the last block, flush the buffer.
@ -134,8 +135,8 @@ namespace stdex
protected:
unsigned char buf[3]; ///< Internal buffer
size_t num; ///< Number of bytes used in `buf`
uint8_t buf[3]; ///< Internal buffer
size_t num; ///< Number of bytes used in `buf`
};
@ -251,13 +252,13 @@ namespace stdex
protected:
unsigned char buf[4]; ///< Internal buffer
size_t num; ///< Number of bytes used in `buf`
uint8_t buf[4]; ///< Internal buffer
size_t num; ///< Number of bytes used in `buf`
};
/// \cond internal
static const unsigned char base64_dec_lookup[256] = {
static const uint8_t base64_dec_lookup[256] = {
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
/* 0 */ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
/* 1 */ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,

15
include/stdex/hex.h
View File

@ -6,6 +6,7 @@
#pragma once
#include "sal.h"
#include <cstdint>
#include <string>
#include <vector>
@ -43,8 +44,8 @@ namespace stdex
// Convert data character by character.
for (size_t i = 0; i < size; i++) {
unsigned char
x = reinterpret_cast<const unsigned char*>(data)[i],
uint8_t
x = reinterpret_cast<const uint8_t*>(data)[i],
x_h = ((x & 0xf0) >> 4),
x_l = ((x & 0x0f) );
@ -118,13 +119,13 @@ namespace stdex
int x = data[i];
if ('0' <= x && x <= '9') {
buf = ((buf & 0xf) << 4) | (unsigned char)(x - '0');
buf = ((buf & 0xf) << 4) | (uint8_t)(x - '0');
num++;
} else if ('A' <= x && x <= 'F') {
buf = ((buf & 0xf) << 4) | (unsigned char)(x - ('A' - 10));
buf = ((buf & 0xf) << 4) | (uint8_t)(x - ('A' - 10));
num++;
} else if ('a' <= x && x <= 'f') {
buf = ((buf & 0xf) << 4) | (unsigned char)(x - ('a' - 10));
buf = ((buf & 0xf) << 4) | (uint8_t)(x - ('a' - 10));
num++;
}
}
@ -154,7 +155,7 @@ namespace stdex
protected:
unsigned char buf; ///< Internal buffer
size_t num; ///< Number of nibbles used in `buf`
uint8_t buf; ///< Internal buffer
size_t num; ///< Number of nibbles used in `buf`
};
}