ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-02-02 05:48:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx++: refine line splitting inside to_hex/to_base58/to_base64 to avoid \n at the end.

Browse Source 
Change-Id: I53fb1f31ac5fc41567826a9035b0080fd62c8ade
This commit is contained in:
Leonid Yuriev 2022-01-15 17:45:32 +03:00
parent ef2e390b10
commit b139d8165b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mdbx.c++
View File

@ -546,15 +546,15 @@ char *to_hex::write_bytes(char *__restrict dest, size_t dest_size) const {
const char alphabase = (uppercase ? 'A' : 'a') - 10; const char alphabase = (uppercase ? 'A' : 'a') - 10;
auto line = dest; auto line = dest;
for (const auto end = source.end_byte_ptr(); src != end; ++src) { for (const auto end = source.end_byte_ptr(); src != end; ++src) {
if (wrap_width && size_t(dest - line) >= wrap_width) {
*dest = '\n';
line = ++dest;
}
const int8_t hi = *src >> 4; const int8_t hi = *src >> 4;
const int8_t lo = *src & 15; const int8_t lo = *src & 15;
dest[0] = char(alphabase + hi + (((hi - 10) >> 7) & -7)); dest[0] = char(alphabase + hi + (((hi - 10) >> 7) & -7));
dest[1] = char(alphabase + lo + (((lo - 10) >> 7) & -7)); dest[1] = char(alphabase + lo + (((lo - 10) >> 7) & -7));
dest += 2; dest += 2;
if (wrap_width && size_t(dest - line) >= wrap_width) {
*dest = '\n';
line = ++dest;
}
} }
return dest; return dest;
} }
@ -671,7 +671,6 @@ char *to_base58::write_bytes(char *__restrict dest, size_t dest_size) const {
size_t left = source.length(); size_t left = source.length();
auto line = dest; auto line = dest;
while (MDBX_LIKELY(left > 7)) { while (MDBX_LIKELY(left > 7)) {
left -= 8;
uint64_t v; uint64_t v;
std::memcpy(&v, src, 8); std::memcpy(&v, src, 8);
src += 8; src += 8;
@ -694,7 +693,8 @@ char *to_base58::write_bytes(char *__restrict dest, size_t dest_size) const {
dest[0] = b58_8to11(v); dest[0] = b58_8to11(v);
assert(v == 0); assert(v == 0);
dest += 11; dest += 11;
if (wrap_width && size_t(dest - line) >= wrap_width) { left -= 8;
if (wrap_width && size_t(dest - line) >= wrap_width && left) {
*dest = '\n'; *dest = '\n';
line = ++dest; line = ++dest;
} }
@ -871,7 +871,7 @@ char *to_base64::write_bytes(char *__restrict dest, size_t dest_size) const {
b64_3to4(src[0], src[1], src[2], dest); b64_3to4(src[0], src[1], src[2], dest);
dest += 4; dest += 4;
src += 3; src += 3;
if (wrap_width && size_t(dest - line) >= wrap_width) { if (wrap_width && size_t(dest - line) >= wrap_width && left) {
*dest = '\n'; *dest = '\n';
line = ++dest; line = ++dest;
} }