Core/Misc: Minor refactors in BaseEncoding and SslSocket to prepare for future bnetserver changes

This commit is contained in:
Shauren
2023-12-16 20:02:20 +01:00
parent 1ce6d5621c
commit 5f00ac4b2b
6 changed files with 16 additions and 14 deletions

View File

@@ -49,7 +49,7 @@ struct B32Impl
return Trinity::Impl::GenericBaseEncoding<B32Impl>::Encode(data);
}
/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base32::Decode(std::string const& data)
/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base32::Decode(std::string_view data)
{
return Trinity::Impl::GenericBaseEncoding<B32Impl>::Decode(data);
}

View File

@@ -21,6 +21,7 @@
#include "Define.h"
#include "Optional.h"
#include <string>
#include <string_view>
#include <vector>
namespace Trinity
@@ -30,7 +31,7 @@ namespace Encoding
struct TC_COMMON_API Base32
{
static std::string Encode(std::vector<uint8> const& data);
static Optional<std::vector<uint8>> Decode(std::string const& data);
static Optional<std::vector<uint8>> Decode(std::string_view data);
};
}
}

View File

@@ -51,7 +51,7 @@ struct B64Impl
return Trinity::Impl::GenericBaseEncoding<B64Impl>::Encode(data);
}
/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base64::Decode(std::string const& data)
/*static*/ Optional<std::vector<uint8>> Trinity::Encoding::Base64::Decode(std::string_view data)
{
return Trinity::Impl::GenericBaseEncoding<B64Impl>::Decode(data);
}

View File

@@ -21,6 +21,7 @@
#include "Define.h"
#include "Optional.h"
#include <string>
#include <string_view>
#include <vector>
namespace Trinity
@@ -30,7 +31,7 @@ namespace Encoding
struct TC_COMMON_API Base64
{
static std::string Encode(std::vector<uint8> const& data);
static Optional<std::vector<uint8>> Decode(std::string const& data);
static Optional<std::vector<uint8>> Decode(std::string_view data);
};
}
}

View File

@@ -22,6 +22,7 @@
#include "Optional.h"
#include <numeric>
#include <string>
#include <string_view>
#include <vector>
namespace Trinity
@@ -100,7 +101,7 @@ struct GenericBaseEncoding
return s;
}
static Optional<std::vector<uint8>> Decode(std::string const& data)
static Optional<std::vector<uint8>> Decode(std::string_view data)
{
auto it = data.begin(), end = data.end();
if (it == end)