From e04619c84f78cadea3fc47a4c4aa5a77d348423b Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 3 Sep 2022 16:39:40 +0200 Subject: [PATCH] Update ContentRedirectionStatus values and rename CONTENT_REDIRECTION_RESULT_INVALID_ARG to CONTENT_REDIRECTION_RESULT_INVALID_ARGUMENT --- include/content_redirection/redirection.h | 18 +++++++++--------- source/utils.cpp | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/content_redirection/redirection.h b/include/content_redirection/redirection.h index 44d427f..a9c7600 100644 --- a/include/content_redirection/redirection.h +++ b/include/content_redirection/redirection.h @@ -38,15 +38,15 @@ enum FSLayerType { typedef enum ContentRedirectionStatus { CONTENT_REDIRECTION_RESULT_SUCCESS = 0, - CONTENT_REDIRECTION_RESULT_MODULE_NOT_FOUND = -1, - CONTENT_REDIRECTION_RESULT_MODULE_MISSING_EXPORT = -2, - CONTENT_REDIRECTION_RESULT_UNSUPPORTED_VERSION = -3, - CONTENT_REDIRECTION_RESULT_INVALID_ARG = -10, - CONTENT_REDIRECTION_RESULT_NO_MEMORY = -11, - CONTENT_REDIRECTION_RESULT_UNKNOWN_FS_LAYER_TYPE = -12, - CONTENT_REDIRECTION_RESULT_LAYER_NOT_FOUND = -13, - CONTENT_REDIRECTION_RESULT_LIB_UNINITIALIZED = -20, - CONTENT_REDIRECTION_RESULT_UNKNOWN_ERROR = -1000, + CONTENT_REDIRECTION_RESULT_MODULE_NOT_FOUND = -0x1, + CONTENT_REDIRECTION_RESULT_MODULE_MISSING_EXPORT = -0x2, + CONTENT_REDIRECTION_RESULT_UNSUPPORTED_VERSION = -0x3, + CONTENT_REDIRECTION_RESULT_INVALID_ARGUMENT = -0x10, + CONTENT_REDIRECTION_RESULT_NO_MEMORY = -0x11, + CONTENT_REDIRECTION_RESULT_UNKNOWN_FS_LAYER_TYPE = -0x12, + CONTENT_REDIRECTION_RESULT_LAYER_NOT_FOUND = -0x13, + CONTENT_REDIRECTION_RESULT_LIB_UNINITIALIZED = -0x20, + CONTENT_REDIRECTION_RESULT_UNKNOWN_ERROR = -0x1000, } ContentRedirectionStatus; typedef uint32_t CRLayerHandle; diff --git a/source/utils.cpp b/source/utils.cpp index 3e7d62d..ac04489 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -76,7 +76,7 @@ ContentRedirectionStatus ContentRedirection_AddFSLayer(CRLayerHandle *handlePtr, } switch (res) { case CONTENT_REDIRECTION_API_ERROR_INVALID_ARG: - return CONTENT_REDIRECTION_RESULT_INVALID_ARG; + return CONTENT_REDIRECTION_RESULT_INVALID_ARGUMENT; case CONTENT_REDIRECTION_API_ERROR_NO_MEMORY: return CONTENT_REDIRECTION_RESULT_NO_MEMORY; case CONTENT_REDIRECTION_API_ERROR_UNKNOWN_FS_LAYER_TYPE: @@ -126,7 +126,7 @@ ContentRedirectionStatus ContentRedirection_AddDevice(const devoptab_t *device, } if (resultOut == nullptr) { - return CONTENT_REDIRECTION_RESULT_INVALID_ARG; + return CONTENT_REDIRECTION_RESULT_INVALID_ARGUMENT; } *resultOut = reinterpret_cast(sCRAddDevice)(device); @@ -138,7 +138,7 @@ ContentRedirectionStatus ContentRedirection_RemoveDevice(const char *name, int * return CONTENT_REDIRECTION_RESULT_LIB_UNINITIALIZED; } if (resultOut == nullptr) { - return CONTENT_REDIRECTION_RESULT_INVALID_ARG; + return CONTENT_REDIRECTION_RESULT_INVALID_ARGUMENT; } *resultOut = reinterpret_cast(sCRRemoveDevice)(name); return CONTENT_REDIRECTION_RESULT_SUCCESS;