diff options
author | FearlessTobi <thm.frey@gmail.com> | 2022-08-28 19:31:16 +0200 |
---|---|---|
committer | FearlessTobi <thm.frey@gmail.com> | 2022-09-02 00:50:32 +0200 |
commit | 65718e2876374aecf2ac29856387dab4394ca47f (patch) | |
tree | 5826079e7f63131021fa11120f17173e6c8e2307 /src/core | |
parent | core/ldn_types: Minor corrections and additions (diff) | |
download | yuzu-65718e2876374aecf2ac29856387dab4394ca47f.tar yuzu-65718e2876374aecf2ac29856387dab4394ca47f.tar.gz yuzu-65718e2876374aecf2ac29856387dab4394ca47f.tar.bz2 yuzu-65718e2876374aecf2ac29856387dab4394ca47f.tar.lz yuzu-65718e2876374aecf2ac29856387dab4394ca47f.tar.xz yuzu-65718e2876374aecf2ac29856387dab4394ca47f.tar.zst yuzu-65718e2876374aecf2ac29856387dab4394ca47f.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/service/ldn/ldn_types.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/core/hle/service/ldn/ldn_types.h b/src/core/hle/service/ldn/ldn_types.h index 0af653164..6231e936d 100644 --- a/src/core/hle/service/ldn/ldn_types.h +++ b/src/core/hle/service/ldn/ldn_types.h @@ -145,26 +145,19 @@ struct NetworkId { static_assert(sizeof(NetworkId) == 0x20, "NetworkId is an invalid size"); struct Ssid { - u8 length; - std::array<char, SsidLengthMax + 1> raw; + u8 length{}; + std::array<char, SsidLengthMax + 1> raw{}; - Ssid() { - length = 0; - std::memset(raw.data(), 0, raw.size()); - } + Ssid() = default; - Ssid(std::string data) { + explicit Ssid(std::string_view data) { length = static_cast<u8>(std::min(data.size(), SsidLengthMax)); - std::memcpy(raw.data(), data.data(), length); + data.copy(raw.data(), length); raw[length] = 0; } std::string GetStringValue() const { - return std::string(raw.data(), length); - } - - bool operator==(const Ssid& b) const { - return (length == b.length) && (std::memcmp(raw.data(), b.raw.data(), length) == 0); + return std::string(raw.data()); } }; static_assert(sizeof(Ssid) == 0x22, "Ssid is an invalid size"); |