From ed64d150603a02990c464e134bc576bca599f697 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 28 Mar 2018 19:40:30 -0400 Subject: [PATCH] disk_archive: Remove unused total_entries_in_directory member from DiskDirectory Also converts initializer list assignments to in-class initializers where relevant. --- src/core/file_sys/disk_archive.cpp | 2 +- src/core/file_sys/disk_archive.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp index 677f92467..faa28b84f 100644 --- a/src/core/file_sys/disk_archive.cpp +++ b/src/core/file_sys/disk_archive.cpp @@ -52,7 +52,7 @@ bool DiskFile::Close() const { //////////////////////////////////////////////////////////////////////////////////////////////////// -DiskDirectory::DiskDirectory(const std::string& path) : directory() { +DiskDirectory::DiskDirectory(const std::string& path) { unsigned size = FileUtil::ScanDirectoryTree(path, directory); directory.size = size; directory.isDirectory = true; diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h index 0de3747a1..025eea3d2 100644 --- a/src/core/file_sys/disk_archive.h +++ b/src/core/file_sys/disk_archive.h @@ -59,8 +59,7 @@ public: } protected: - u32 total_entries_in_directory; - FileUtil::FSTEntry directory; + FileUtil::FSTEntry directory{}; // We need to remember the last entry we returned, so a subsequent call to Read will continue // from the next one. This iterator will always point to the next unread entry.