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

mdbx++: rename slice::from/to_FOO_bytes() to `slice::envisage_from/to_FOO_length()'.

Browse Source
This commit is contained in:
Leonid Yuriev 2021-07-02 20:24:15 +03:00
parent 750a17e41e
commit fa49e5a57b
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mdbx.h++
View File

@ -499,78 +499,78 @@ struct LIBMDBX_API_TYPE slice : public ::MDBX_val {
return this->string<C, T, A>(); return this->string<C, T, A>();
} }
/// \brief Fills the buffer by hexadecimal data dump of slice content. /// \brief Fills the destination by hexadecimal data dump of slice content.
/// \throws std::length_error if given buffer is too small. /// \throws std::length_error if given buffer is too small.
char *to_hex(char *dest, size_t dest_size, bool uppercase = false, char *to_hex(char *dest, size_t dest_size, bool uppercase = false,
unsigned wrap_width = 0) const; unsigned wrap_width = 0) const;
/// \brief Returns the buffer size in bytes needed for hexadecimal data dump /// \brief Returns the number of bytes needed for hexadecimal data dump
/// of slice content. /// of slice content.
MDBX_CXX11_CONSTEXPR size_t MDBX_CXX11_CONSTEXPR size_t
to_hex_bytes(unsigned wrap_width = 0) const noexcept { envisage_to_hex_length(unsigned wrap_width = 0) const noexcept {
const size_t bytes = length() << 1; const size_t bytes = length() << 1;
return wrap_width ? bytes + bytes / wrap_width : bytes; return wrap_width ? bytes + bytes / wrap_width : bytes;
} }
/// \brief Fills the buffer with data converted from hexadecimal dump /// \brief Fills the destination with data converted from hexadecimal dump
/// from slice content. /// from slice content.
/// \throws std::length_error if given buffer is too small. /// \throws std::length_error if given buffer is too small.
byte *from_hex(byte *dest, size_t dest_size, byte *from_hex(byte *dest, size_t dest_size,
bool ignore_spaces = false) const; bool ignore_spaces = false) const;
/// \brief Returns the buffer size in bytes needed for conversion /// \brief Returns the number of bytes needed for conversion
/// hexadecimal dump from slice content to data. /// hexadecimal dump from slice content to data.
MDBX_CXX11_CONSTEXPR size_t from_hex_bytes() const noexcept { MDBX_CXX11_CONSTEXPR size_t envisage_from_hex_length() const noexcept {
return length() >> 1; return length() >> 1;
} }
/// \brief Fills the buffer by [Base58](https://en.wikipedia.org/wiki/Base58) /// \brief Fills the destination by
/// data dump of slice content. /// [Base58](https://en.wikipedia.org/wiki/Base58) data dump of slice content.
/// \throws std::length_error if given buffer is too small. /// \throws std::length_error if given buffer is too small.
char *to_base58(char *dest, size_t dest_size, unsigned wrap_width = 0) const; char *to_base58(char *dest, size_t dest_size, unsigned wrap_width = 0) const;
/// \brief Returns the buffer size in bytes needed for /// \brief Returns the number of bytes needed for
/// [Base58](https://en.wikipedia.org/wiki/Base58) data dump of slice content. /// [Base58](https://en.wikipedia.org/wiki/Base58) data dump of slice content.
MDBX_CXX11_CONSTEXPR size_t MDBX_CXX11_CONSTEXPR size_t
to_base58_bytes(unsigned wrap_width = 0) const noexcept { envisage_to_base58_length(unsigned wrap_width = 0) const noexcept {
const size_t bytes = length() / 8 * 11 + (length() % 8 * 43 + 31) / 32; const size_t bytes = length() / 8 * 11 + (length() % 8 * 43 + 31) / 32;
return wrap_width ? bytes + bytes / wrap_width : bytes; return wrap_width ? bytes + bytes / wrap_width : bytes;
} }
/// \brief Fills the buffer with data converted from /// \brief Fills the destination with data converted from
/// [Base58](https://en.wikipedia.org/wiki/Base58) dump from slice content. /// [Base58](https://en.wikipedia.org/wiki/Base58) dump from slice content.
/// \throws std::length_error if given buffer is too small. /// \throws std::length_error if given buffer is too small.
byte *from_base58(byte *dest, size_t dest_size, byte *from_base58(byte *dest, size_t dest_size,
bool ignore_spaces = false) const; bool ignore_spaces = false) const;
/// \brief Returns the buffer size in bytes needed for conversion /// \brief Returns the number of bytes needed for conversion
/// [Base58](https://en.wikipedia.org/wiki/Base58) dump to data. /// [Base58](https://en.wikipedia.org/wiki/Base58) dump to data.
MDBX_CXX11_CONSTEXPR size_t from_base58_bytes() const noexcept { MDBX_CXX11_CONSTEXPR size_t envisage_from_base58_length() const noexcept {
return length() / 11 * 8 + length() % 11 * 32 / 43; return length() / 11 * 8 + length() % 11 * 32 / 43;
} }
/// \brief Fills the buffer by [Base64](https://en.wikipedia.org/wiki/Base64) /// \brief Fills the destination by
/// data dump. /// [Base64](https://en.wikipedia.org/wiki/Base64) data dump. \throws
/// \throws std::length_error if given buffer is too small. /// std::length_error if given buffer is too small.
char *to_base64(char *dest, size_t dest_size, unsigned wrap_width = 0) const; char *to_base64(char *dest, size_t dest_size, unsigned wrap_width = 0) const;
/// \brief Returns the buffer size in bytes needed for /// \brief Returns the number of bytes needed for
/// [Base64](https://en.wikipedia.org/wiki/Base64) data dump. /// [Base64](https://en.wikipedia.org/wiki/Base64) data dump.
MDBX_CXX11_CONSTEXPR size_t MDBX_CXX11_CONSTEXPR size_t
to_base64_bytes(unsigned wrap_width = 0) const noexcept { envisage_to_base64_length(unsigned wrap_width = 0) const noexcept {
const size_t bytes = (length() + 2) / 3 * 4; const size_t bytes = (length() + 2) / 3 * 4;
return wrap_width ? bytes + bytes / wrap_width : bytes; return wrap_width ? bytes + bytes / wrap_width : bytes;
} }
/// \brief Fills the buffer with data converted from /// \brief Fills the destination with data converted from
/// [Base64](https://en.wikipedia.org/wiki/Base64) dump. /// [Base64](https://en.wikipedia.org/wiki/Base64) dump.
/// \throws std::length_error if given buffer is too small. /// \throws std::length_error if given buffer is too small.
byte *from_base64(byte *dest, size_t dest_size, byte *from_base64(byte *dest, size_t dest_size,
bool ignore_spaces = false) const; bool ignore_spaces = false) const;
/// \brief Returns the buffer size in bytes needed for conversion /// \brief Returns the number of bytes needed for conversion
/// [Base64](https://en.wikipedia.org/wiki/Base64) dump to data. /// [Base64](https://en.wikipedia.org/wiki/Base64) dump to data.
MDBX_CXX11_CONSTEXPR size_t from_base64_bytes() const noexcept { MDBX_CXX11_CONSTEXPR size_t envisage_from_base64_length() const noexcept {
return (length() + 3) / 4 * 3; return (length() + 3) / 4 * 3;
} }
@ -3190,7 +3190,7 @@ inline ::mdbx::string<ALLOCATOR>
slice::hex_encode(bool uppercase, const ALLOCATOR &allocator) const { slice::hex_encode(bool uppercase, const ALLOCATOR &allocator) const {
::mdbx::string<ALLOCATOR> result(allocator); ::mdbx::string<ALLOCATOR> result(allocator);
if (MDBX_LIKELY(length() > 0)) { if (MDBX_LIKELY(length() > 0)) {
result.resize(to_hex_bytes()); result.resize(envisage_to_hex_length());
result.resize(to_hex(const_cast<char *>(result.data()), result.capacity()) - result.resize(to_hex(const_cast<char *>(result.data()), result.capacity()) -
result.data(), result.data(),
uppercase); uppercase);
@ -3203,7 +3203,7 @@ inline ::mdbx::string<ALLOCATOR>
slice::hex_decode(const ALLOCATOR &allocator) const { slice::hex_decode(const ALLOCATOR &allocator) const {
::mdbx::string<ALLOCATOR> result(allocator); ::mdbx::string<ALLOCATOR> result(allocator);
if (MDBX_LIKELY(length() > 0)) { if (MDBX_LIKELY(length() > 0)) {
result.resize(from_hex_bytes()); result.resize(envisage_from_hex_length());
result.resize( result.resize(
from_hex(static_cast<byte *>( from_hex(static_cast<byte *>(
static_cast<void *>(const_cast<char *>(result.data()))), static_cast<void *>(const_cast<char *>(result.data()))),
@ -3218,7 +3218,7 @@ inline ::mdbx::string<ALLOCATOR>
slice::base58_encode(const ALLOCATOR &allocator) const { slice::base58_encode(const ALLOCATOR &allocator) const {
::mdbx::string<ALLOCATOR> result(allocator); ::mdbx::string<ALLOCATOR> result(allocator);
if (MDBX_LIKELY(length() > 0)) { if (MDBX_LIKELY(length() > 0)) {
result.resize(to_base58_bytes()); result.resize(envisage_to_base58_length());
result.resize( result.resize(
to_base58(const_cast<char *>(result.data()), result.capacity()) - to_base58(const_cast<char *>(result.data()), result.capacity()) -
result.data()); result.data());
@ -3231,7 +3231,7 @@ inline ::mdbx::string<ALLOCATOR>
slice::base58_decode(const ALLOCATOR &allocator) const { slice::base58_decode(const ALLOCATOR &allocator) const {
::mdbx::string<ALLOCATOR> result(allocator); ::mdbx::string<ALLOCATOR> result(allocator);
if (MDBX_LIKELY(length() > 0)) { if (MDBX_LIKELY(length() > 0)) {
result.resize(from_base58_bytes()); result.resize(envisage_from_base58_length());
result.resize( result.resize(
from_base58(static_cast<byte *>( from_base58(static_cast<byte *>(
static_cast<void *>(const_cast<char *>(result.data()))), static_cast<void *>(const_cast<char *>(result.data()))),
@ -3246,7 +3246,7 @@ inline ::mdbx::string<ALLOCATOR>
slice::base64_encode(const ALLOCATOR &allocator) const { slice::base64_encode(const ALLOCATOR &allocator) const {
::mdbx::string<ALLOCATOR> result(allocator); ::mdbx::string<ALLOCATOR> result(allocator);
if (MDBX_LIKELY(length() > 0)) { if (MDBX_LIKELY(length() > 0)) {
result.resize(to_base64_bytes()); result.resize(envisage_to_base64_length());
result.resize( result.resize(
to_base64(const_cast<char *>(result.data()), result.capacity()) - to_base64(const_cast<char *>(result.data()), result.capacity()) -
result.data()); result.data());
@ -3259,7 +3259,7 @@ inline ::mdbx::string<ALLOCATOR>
slice::base64_decode(const ALLOCATOR &allocator) const { slice::base64_decode(const ALLOCATOR &allocator) const {
::mdbx::string<ALLOCATOR> result(allocator); ::mdbx::string<ALLOCATOR> result(allocator);
if (MDBX_LIKELY(length() > 0)) { if (MDBX_LIKELY(length() > 0)) {
result.resize(from_base64_bytes()); result.resize(envisage_from_base64_length());
result.resize( result.resize(
from_base64(static_cast<byte *>( from_base64(static_cast<byte *>(
static_cast<void *>(const_cast<char *>(result.data()))), static_cast<void *>(const_cast<char *>(result.data()))),

12
src/mdbx.c++
View File

@ -534,7 +534,7 @@ bool slice::is_printable(bool disable_utf8) const noexcept {
char *slice::to_hex(char *__restrict dest, size_t dest_size, bool uppercase, char *slice::to_hex(char *__restrict dest, size_t dest_size, bool uppercase,
unsigned wrap_width) const { unsigned wrap_width) const {
if (MDBX_UNLIKELY(to_hex_bytes(wrap_width) > dest_size)) if (MDBX_UNLIKELY(envisage_to_hex_length(wrap_width) > dest_size))
throw_too_small_target_buffer(); throw_too_small_target_buffer();
auto src = byte_ptr(); auto src = byte_ptr();
@ -559,7 +559,7 @@ byte *slice::from_hex(byte *__restrict dest, size_t dest_size,
if (MDBX_UNLIKELY(length() % 2 && !ignore_spaces)) if (MDBX_UNLIKELY(length() % 2 && !ignore_spaces))
throw std::domain_error( throw std::domain_error(
"mdbx::from_hex:: odd length of hexadecimal string"); "mdbx::from_hex:: odd length of hexadecimal string");
if (MDBX_UNLIKELY(from_hex_bytes() > dest_size)) if (MDBX_UNLIKELY(envisage_from_hex_length() > dest_size))
throw_too_small_target_buffer(); throw_too_small_target_buffer();
auto src = byte_ptr(); auto src = byte_ptr();
@ -660,7 +660,7 @@ static inline char b58_8to11(uint64_t &v) noexcept {
char *slice::to_base58(char *__restrict dest, size_t dest_size, char *slice::to_base58(char *__restrict dest, size_t dest_size,
unsigned wrap_width) const { unsigned wrap_width) const {
if (MDBX_UNLIKELY(to_base58_bytes(wrap_width) > dest_size)) if (MDBX_UNLIKELY(envisage_to_base58_length(wrap_width) > dest_size))
throw_too_small_target_buffer(); throw_too_small_target_buffer();
auto src = byte_ptr(); auto src = byte_ptr();
@ -743,7 +743,7 @@ static inline signed char b58_11to8(uint64_t &v, const byte c) noexcept {
byte *slice::from_base58(byte *__restrict dest, size_t dest_size, byte *slice::from_base58(byte *__restrict dest, size_t dest_size,
bool ignore_spaces) const { bool ignore_spaces) const {
if (MDBX_UNLIKELY(from_base58_bytes() > dest_size)) if (MDBX_UNLIKELY(envisage_from_base58_length() > dest_size))
throw_too_small_target_buffer(); throw_too_small_target_buffer();
auto src = byte_ptr(); auto src = byte_ptr();
@ -856,7 +856,7 @@ static inline void b64_3to4(const byte x, const byte y, const byte z,
char *slice::to_base64(char *__restrict dest, size_t dest_size, char *slice::to_base64(char *__restrict dest, size_t dest_size,
unsigned wrap_width) const { unsigned wrap_width) const {
if (MDBX_UNLIKELY(to_base64_bytes(wrap_width) > dest_size)) if (MDBX_UNLIKELY(envisage_to_base64_length(wrap_width) > dest_size))
throw_too_small_target_buffer(); throw_too_small_target_buffer();
auto src = byte_ptr(); auto src = byte_ptr();
@ -921,7 +921,7 @@ byte *slice::from_base64(byte *__restrict dest, size_t dest_size,
bool ignore_spaces) const { bool ignore_spaces) const {
if (MDBX_UNLIKELY(length() % 4 && !ignore_spaces)) if (MDBX_UNLIKELY(length() % 4 && !ignore_spaces))
throw std::domain_error("mdbx::from_base64:: odd length of base64 string"); throw std::domain_error("mdbx::from_base64:: odd length of base64 string");
if (MDBX_UNLIKELY(from_base64_bytes() > dest_size)) if (MDBX_UNLIKELY(envisage_from_base64_length() > dest_size))
throw_too_small_target_buffer(); throw_too_small_target_buffer();
auto src = byte_ptr(); auto src = byte_ptr();