BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

updated build system
Some checks are pending
BlockStorage/repertory/pipeline/head Build queued...
Details

Browse Source
This commit is contained in:
Scott E. Graves
2024-08-31 13:30:49 -05:00
parent dfd34628a8
commit ce5ceeb53b
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
support/include/utils/common.hpp
View File

@ -74,11 +74,9 @@ template <typename data_t>
[[nodiscard]] inline auto generate_random_between(data_t begin, [[nodiscard]] inline auto generate_random_between(data_t begin,
data_t end) -> data_t; data_t end) -> data_t;
#if defined(PROJECT_ENABLE_LIBSODIUM)
[[nodiscard]] auto generate_random_string(std::size_t length) -> std::string; [[nodiscard]] auto generate_random_string(std::size_t length) -> std::string;
[[nodiscard]] auto generate_random_wstring(std::size_t length) -> std::wstring; [[nodiscard]] auto generate_random_wstring(std::size_t length) -> std::wstring;
#endif // defined(PROJECT_ENABLE_LIBSODIUM)
[[nodiscard]] auto [[nodiscard]] auto
get_environment_variable(std::string_view variable) -> std::string; get_environment_variable(std::string_view variable) -> std::string;

6
support/src/utils/common.cpp
View File

@ -83,7 +83,6 @@ auto create_uuid_wstring() -> std::wstring {
} }
#endif // defined(PROJECT_ENABLE_STDUUID) #endif // defined(PROJECT_ENABLE_STDUUID)
#if defined(PROJECT_ENABLE_LIBSODIUM)
auto generate_random_string(std::size_t length) -> std::string { auto generate_random_string(std::size_t length) -> std::string {
std::string ret; std::string ret;
if (length == 0U) { if (length == 0U) {
@ -98,9 +97,7 @@ auto generate_random_string(std::size_t length) -> std::string {
generate_random_between(97U, 255U), generate_random_between(97U, 255U),
}; };
ch = static_cast<char>( ch = static_cast<char>(
random_list.at(repertory::utils::generate_random_between(0U, 2U)) % random_list.at(generate_random_between(0U, 2U)) % 74U + 48U);
74U +
48U);
} }
return ret; return ret;
@ -109,7 +106,6 @@ auto generate_random_string(std::size_t length) -> std::string {
auto generate_random_wstring(std::size_t length) -> std::wstring { auto generate_random_wstring(std::size_t length) -> std::wstring {
return utils::string::from_utf8(generate_random_string(length)); return utils::string::from_utf8(generate_random_string(length));
} }
#endif // defined(PROJECT_ENABLE_LIBSODIUM)
auto get_environment_variable(std::string_view variable) -> std::string { auto get_environment_variable(std::string_view variable) -> std::string {
static std::mutex mtx{}; static std::mutex mtx{};

2
support/test/src/utils/common_test.cpp
View File

@ -238,7 +238,6 @@ TEST(utils_common, generate_random_between_throws_error_on_invalid_range) {
std::range_error); std::range_error);
} }
#if defined(PROJECT_ENABLE_LIBSODIUM)
TEST(utils_common, generate_random_string) { TEST(utils_common, generate_random_string) {
static constexpr const auto max_iterations{10000L}; static constexpr const auto max_iterations{10000L};
@ -266,7 +265,6 @@ TEST(utils_common, generate_random_string_for_zero_length) {
EXPECT_TRUE(utils::generate_random_string(0U).empty()); EXPECT_TRUE(utils::generate_random_string(0U).empty());
EXPECT_TRUE(utils::generate_random_wstring(0U).empty()); EXPECT_TRUE(utils::generate_random_wstring(0U).empty());
} }
#endif // defined(PROJECT_ENABLE_LIBSODIUM)
TEST(utils_common, get_environment_variable) { TEST(utils_common, get_environment_variable) {
static constexpr const std::string path_env{"PATH"}; static constexpr const std::string path_env{"PATH"};