aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorGravatar Subv <subv2112@gmail.com>2015-01-06 15:02:30 -0500
committerGravatar Subv <subv2112@gmail.com>2015-01-06 15:02:30 -0500
commit5244ac0e9c784c402946616f913a8b4fe63af88c (patch)
treebcf65d06fd74515c7697bd3add119e722eda667f /src/core/file_sys
parent123a76c9c8ba56f7f7ce28fed4e8a3302471b215 (diff)
Archives: Addressed some comments
Diffstat (limited to 'src/core/file_sys')
-rw-r--r--src/core/file_sys/archive_extsavedata.cpp2
-rw-r--r--src/core/file_sys/archive_savedata.cpp12
-rw-r--r--src/core/file_sys/archive_savedatacheck.cpp8
-rw-r--r--src/core/file_sys/archive_sdmc.cpp4
4 files changed, 13 insertions, 13 deletions
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp
index 50ca878e..b8f8b2ed 100644
--- a/src/core/file_sys/archive_extsavedata.cpp
+++ b/src/core/file_sys/archive_extsavedata.cpp
@@ -34,7 +34,7 @@ static std::string GetExtDataContainerPath(const std::string& mount_point, bool
}
Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_location, bool shared)
- : DiskArchive(GetExtDataContainerPath(mount_location, shared)), concrete_mount_point(mount_point) {
+ : DiskArchive(GetExtDataContainerPath(mount_location, shared)), concrete_mount_point(mount_point) {
LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str());
}
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp
index ecce7c10..3baee529 100644
--- a/src/core/file_sys/archive_savedata.cpp
+++ b/src/core/file_sys/archive_savedata.cpp
@@ -17,19 +17,19 @@
namespace FileSys {
-static std::string GetSaveDataContainerPath(const std::string& mount_point) {
- return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", mount_point.c_str(),
+static std::string GetSaveDataContainerPath(const std::string& sdmc_directory) {
+ return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", sdmc_directory.c_str(),
SYSTEM_ID.c_str(), SDCARD_ID.c_str());
}
-static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) {
+static std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) {
u32 high = program_id >> 32;
u32 low = program_id & 0xFFFFFFFF;
- return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_point.c_str(), high, low);
+ return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low);
}
-Archive_SaveData::Archive_SaveData(const std::string& mount_point)
- : DiskArchive(GetSaveDataContainerPath(mount_point)) {
+Archive_SaveData::Archive_SaveData(const std::string& sdmc_directory)
+ : DiskArchive(GetSaveDataContainerPath(sdmc_directory)) {
LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str());
}
diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp
index 82449d1b..a7a50753 100644
--- a/src/core/file_sys/archive_savedatacheck.cpp
+++ b/src/core/file_sys/archive_savedatacheck.cpp
@@ -12,8 +12,8 @@
namespace FileSys {
-static std::string GetSaveDataCheckContainerPath(const std::string& mount_point) {
- return Common::StringFromFormat("%s%s/title/", mount_point.c_str(), SYSTEM_ID.c_str());
+static std::string GetSaveDataCheckContainerPath(const std::string& nand_directory) {
+ return Common::StringFromFormat("%s%s/title/", nand_directory.c_str(), SYSTEM_ID.c_str());
}
static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high, u32 low) {
@@ -21,8 +21,8 @@ static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high
mount_point.c_str(), high, low);
}
-Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& mount_loc) :
-mount_point(GetSaveDataCheckContainerPath(mount_loc)) {
+Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& nand_directory) :
+ mount_point(GetSaveDataCheckContainerPath(nand_directory)) {
}
ResultCode Archive_SaveDataCheck::Open(const Path& path) {
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp
index 1c1c170b..26b03e82 100644
--- a/src/core/file_sys/archive_sdmc.cpp
+++ b/src/core/file_sys/archive_sdmc.cpp
@@ -16,8 +16,8 @@
namespace FileSys {
-Archive_SDMC::Archive_SDMC(const std::string& mount_point) : DiskArchive(mount_point) {
- LOG_INFO(Service_FS, "Directory %s set as SDMC.", mount_point.c_str());
+Archive_SDMC::Archive_SDMC(const std::string& sdmc_directory) : DiskArchive(sdmc_directory) {
+ LOG_INFO(Service_FS, "Directory %s set as SDMC.", sdmc_directory.c_str());
}
bool Archive_SDMC::Initialize() {