diff --git a/libi2pd/Base.cpp b/libi2pd/Base.cpp index 9b300982..059ed2ce 100644 --- a/libi2pd/Base.cpp +++ b/libi2pd/Base.cpp @@ -23,7 +23,7 @@ namespace data 'y', 'z', '2', '3', '4', '5', '6', '7', }; - const char * GetBase32SubstitutionTable () + std::span GetBase32SubstitutionTable () { return T32; } @@ -50,7 +50,7 @@ namespace data '4', '5', '6', '7', '8', '9', '-', '~' }; - const char * GetBase64SubstitutionTable () + std::span GetBase64SubstitutionTable () { return T64; } diff --git a/libi2pd/Base.h b/libi2pd/Base.h index ef1a457c..33ab4684 100644 --- a/libi2pd/Base.h +++ b/libi2pd/Base.h @@ -12,6 +12,7 @@ #include #include #include +#include #include namespace i2p @@ -21,8 +22,8 @@ namespace data std::string ByteStreamToBase64 (const uint8_t * InBuffer, size_t InCount); size_t Base64ToByteStream (std::string_view base64Str, uint8_t * OutBuffer, size_t len); - const char * GetBase32SubstitutionTable (); - const char * GetBase64SubstitutionTable (); + std::span GetBase32SubstitutionTable (); + std::span GetBase64SubstitutionTable (); constexpr bool IsBase64 (char ch) { return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9') || ch == '-' || ch == '~'; diff --git a/libi2pd/FS.cpp b/libi2pd/FS.cpp index 096bf819..43ec52c8 100644 --- a/libi2pd/FS.cpp +++ b/libi2pd/FS.cpp @@ -300,16 +300,16 @@ namespace fs { root = path + i2p::fs::dirSep + name; } - bool HashedStorage::Init(const char * chars, size_t count) + bool HashedStorage::Init(std::span chars) { try { if (!fs_lib::exists(root)) fs_lib::create_directories(root); - for (size_t i = 0; i < count; i++) + for (auto ch: chars) { - auto p = root + i2p::fs::dirSep + prefix1 + chars[i]; + auto p = root + i2p::fs::dirSep + prefix1 + ch; if (fs_lib::exists(p)) continue; #if TARGET_OS_SIMULATOR diff --git a/libi2pd/FS.h b/libi2pd/FS.h index 4de6992b..5bacdd73 100644 --- a/libi2pd/FS.h +++ b/libi2pd/FS.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -27,8 +28,10 @@ # endif #endif -namespace i2p { -namespace fs { +namespace i2p +{ +namespace fs +{ extern std::string dirSep; /** @@ -64,7 +67,7 @@ namespace fs { name(n), prefix1(p1), prefix2(p2), suffix(s) {}; /** create subdirs in storage */ - bool Init(const char* chars, size_t cnt); + bool Init(std::span chars); const std::string & GetRoot() const { return root; } const std::string & GetName() const { return name; } /** set directory where to place storage directory */ diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp index 570010af..3fd7186d 100644 --- a/libi2pd/NetDb.cpp +++ b/libi2pd/NetDb.cpp @@ -55,7 +55,7 @@ namespace data void NetDb::Start () { m_Storage.SetPlace(i2p::fs::GetDataDir()); - m_Storage.Init(i2p::data::GetBase64SubstitutionTable(), 64); + m_Storage.Init(i2p::data::GetBase64SubstitutionTable()); InitProfilesStorage (); m_Families.LoadCertificates (); Load (); diff --git a/libi2pd/Profiling.cpp b/libi2pd/Profiling.cpp index 72e4eb3e..0f83b2b2 100644 --- a/libi2pd/Profiling.cpp +++ b/libi2pd/Profiling.cpp @@ -304,7 +304,7 @@ namespace data void InitProfilesStorage () { g_ProfilesStorage.SetPlace(i2p::fs::GetDataDir()); - g_ProfilesStorage.Init(i2p::data::GetBase64SubstitutionTable(), 64); + g_ProfilesStorage.Init(i2p::data::GetBase64SubstitutionTable()); } static void SaveProfilesToDisk (std::list > >&& profiles) diff --git a/libi2pd_client/AddressBook.cpp b/libi2pd_client/AddressBook.cpp index 5ab4b35a..7a9340de 100644 --- a/libi2pd_client/AddressBook.cpp +++ b/libi2pd_client/AddressBook.cpp @@ -83,7 +83,7 @@ namespace client { storage.SetPlace(i2p::fs::GetDataDir()); // init storage - if (storage.Init(i2p::data::GetBase32SubstitutionTable(), 32)) + if (storage.Init(i2p::data::GetBase32SubstitutionTable())) { // init ETags etagsPath = i2p::fs::StorageRootPath (storage, "etags");