From a4ef6e583773ba6617af654fa83cd9e950fcbc23 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Sun, 24 May 2015 04:19:26 -0500
Subject: [PATCH] Renamed QueryVolume to QueryVolumeInfo,
 QueryFileSystemAttributes to QueryAttributeInfo.

---
 src/xenia/kernel/fs/device.cc   | 9 ++++-----
 src/xenia/kernel/fs/device.h    | 5 ++---
 src/xenia/kernel/xboxkrnl_io.cc | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/xenia/kernel/fs/device.cc b/src/xenia/kernel/fs/device.cc
index b3457ad42..fabf9b251 100644
--- a/src/xenia/kernel/fs/device.cc
+++ b/src/xenia/kernel/fs/device.cc
@@ -19,8 +19,8 @@ Device::Device(const std::string& path) : path_(path) {}
 
 Device::~Device() = default;
 
-// TODO(gibbed): call into HostPathDevice?
-X_STATUS Device::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
+// TODO(gibbed): make virtual + move implementation into HostPathDevice/etc.
+X_STATUS Device::QueryVolumeInfo(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
   assert_not_null(out_info);
   const char* name = "test";  // TODO(gibbed): actual value
 
@@ -38,9 +38,8 @@ X_STATUS Device::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t leng
   return X_STATUS_SUCCESS;
 }
 
-// TODO(gibbed): call into HostPathDevice?
-X_STATUS Device::QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
-                                           size_t length) {
+// TODO(gibbed): make virtual + move implementation into HostPathDevice/etc.
+X_STATUS Device::QueryAttributeInfo(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
   assert_not_null(out_info);
   const char* name = "test";  // TODO(gibbed): actual value
 
diff --git a/src/xenia/kernel/fs/device.h b/src/xenia/kernel/fs/device.h
index c7554d6fb..86e86abd8 100644
--- a/src/xenia/kernel/fs/device.h
+++ b/src/xenia/kernel/fs/device.h
@@ -30,9 +30,8 @@ class Device {
 
   virtual std::unique_ptr<Entry> ResolvePath(const char* path) = 0;
 
-  virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length);
-  virtual X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
-                                             size_t length);
+  virtual X_STATUS QueryVolumeInfo(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length);
+  virtual X_STATUS QueryAttributeInfo(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length);
 
  protected:
   std::string path_;
diff --git a/src/xenia/kernel/xboxkrnl_io.cc b/src/xenia/kernel/xboxkrnl_io.cc
index c9f7380a2..61982fce1 100644
--- a/src/xenia/kernel/xboxkrnl_io.cc
+++ b/src/xenia/kernel/xboxkrnl_io.cc
@@ -617,7 +617,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
     switch (fs_info_class) {
       case 1: {  // FileFsVolumeInformation
         auto volume_info = (X_FILE_FS_VOLUME_INFORMATION*)calloc(length, 1);
-        result = file->device()->QueryVolume(volume_info, length);
+        result = file->device()->QueryVolumeInfo(volume_info, length);
         if (XSUCCEEDED(result)) {
           volume_info->Write(SHIM_MEM_BASE, fs_info_ptr);
           info = length;
@@ -627,7 +627,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
       }
       case 5: {  // FileFsAttributeInformation
         auto fs_attribute_info = (X_FILE_FS_ATTRIBUTE_INFORMATION*)calloc(length, 1);
-        result = file->device()->QueryFileSystemAttributes(fs_attribute_info, length);
+        result = file->device()->QueryAttributeInfo(fs_attribute_info, length);
         if (XSUCCEEDED(result)) {
           fs_attribute_info->Write(SHIM_MEM_BASE, fs_info_ptr);
           info = length;