From b34f2a78f59fb51425e62c99df6abefc6d45e8c0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 9 Sep 2014 18:57:45 -0400 Subject: [PATCH] DiscIO: Simplify GetUniqueID in VolumeDirectory --- Source/Core/DiscIO/VolumeDirectory.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index 546401f31f..25441733cf 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -148,12 +148,8 @@ bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const std::string CVolumeDirectory::GetUniqueID() const { - char buffer[7]; - memcpy(buffer, m_diskHeader.data(), 6); - buffer[6] = 0; - - std::string id = buffer; - return id; + static const size_t ID_LENGTH = 6; + return std::string(m_diskHeader.begin(), m_diskHeader.begin() + ID_LENGTH); } void CVolumeDirectory::SetUniqueID(std::string _ID)