From 21e653aab63825f3e47ab7441e2c06c90e0d1fd1 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 16 Nov 2018 00:08:41 -0500
Subject: [PATCH] file_sys/errors: Get rid of the ErrCodes namespace

There's no real point to keeping the separate enum around, especially
given the name of the error code itself is supposed to document what the
value actually represents.
---
 src/core/file_sys/errors.h | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/core/file_sys/errors.h b/src/core/file_sys/errors.h
index 043fccf42c..40e2b41b03 100644
--- a/src/core/file_sys/errors.h
+++ b/src/core/file_sys/errors.h
@@ -8,19 +8,6 @@
 
 namespace FileSys {
 
-namespace ErrCodes {
-enum {
-    NotFound = 1,
-    EntityNotFound = 1002,
-    SdCardNotFound = 2001,
-    RomFSNotFound = 2520,
-    InvalidOffset = 6061,
-    InvalidSize = 6062,
-};
-}
-
-constexpr ResultCode ERROR_PATH_NOT_FOUND(ErrorModule::FS, ErrCodes::NotFound);
-
 // TODO(bunnei): Replace these with correct errors for Switch OS
 constexpr ResultCode ERROR_INVALID_PATH(-1);
 constexpr ResultCode ERROR_UNSUPPORTED_OPEN_FLAGS(-1);
@@ -31,9 +18,10 @@ constexpr ResultCode ERROR_DIRECTORY_ALREADY_EXISTS(-1);
 constexpr ResultCode ERROR_FILE_ALREADY_EXISTS(-1);
 constexpr ResultCode ERROR_DIRECTORY_NOT_EMPTY(-1);
 
-constexpr ResultCode ERROR_ENTITY_NOT_FOUND{ErrorModule::FS, ErrCodes::EntityNotFound};
-constexpr ResultCode ERROR_SD_CARD_NOT_FOUND{ErrorModule::FS, ErrCodes::SdCardNotFound};
-constexpr ResultCode ERROR_INVALID_OFFSET{ErrorModule::FS, ErrCodes::InvalidOffset};
-constexpr ResultCode ERROR_INVALID_SIZE{ErrorModule::FS, ErrCodes::InvalidSize};
+constexpr ResultCode ERROR_PATH_NOT_FOUND{ErrorModule::FS, 1};
+constexpr ResultCode ERROR_ENTITY_NOT_FOUND{ErrorModule::FS, 1002};
+constexpr ResultCode ERROR_SD_CARD_NOT_FOUND{ErrorModule::FS, 2001};
+constexpr ResultCode ERROR_INVALID_OFFSET{ErrorModule::FS, 6061};
+constexpr ResultCode ERROR_INVALID_SIZE{ErrorModule::FS, 6062};
 
 } // namespace FileSys