From 487d1589f51df496a622265cd763e8cdae24d4ff Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 6 Aug 2022 15:06:28 +0200 Subject: [PATCH] Add missing const to paths in function replacements --- src/FSDirReplacements.cpp | 8 ++++---- src/FSFileReplacements.cpp | 20 ++++++++++---------- src/FileUtils.cpp | 2 +- src/FileUtils.h | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/FSDirReplacements.cpp b/src/FSDirReplacements.cpp index 653f25a..26795d1 100644 --- a/src/FSDirReplacements.cpp +++ b/src/FSDirReplacements.cpp @@ -5,7 +5,7 @@ #include #include -DECL_FUNCTION(FSStatus, FSOpenDir, FSClient *client, FSCmdBlock *block, char *path, FSDirectoryHandle *handle, FSErrorFlag errorMask) { +DECL_FUNCTION(FSStatus, FSOpenDir, FSClient *client, FSCmdBlock *block, const char *path, FSDirectoryHandle *handle, FSErrorFlag errorMask) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSOpenDir(client, block, path, handle, errorMask); @@ -23,7 +23,7 @@ DECL_FUNCTION(FSStatus, FSOpenDir, FSClient *client, FSCmdBlock *block, char *pa } -DECL_FUNCTION(FSStatus, FSOpenDirAsync, FSClient *client, FSCmdBlock *block, char *path, FSDirectoryHandle *handle, FSErrorFlag errorMask, FSAsyncData *asyncData) { +DECL_FUNCTION(FSStatus, FSOpenDirAsync, FSClient *client, FSCmdBlock *block, const char *path, FSDirectoryHandle *handle, FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSOpenDirAsync(client, block, path, handle, getRealErrorFlag(errorMask), asyncData); @@ -158,7 +158,7 @@ DECL_FUNCTION(FSStatus, FSRewindDirAsync, FSClient *client, FSCmdBlock *block, F ASYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSMakeDir, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask) { +DECL_FUNCTION(FSStatus, FSMakeDir, FSClient *client, FSCmdBlock *block, const char *path, FSErrorFlag errorMask) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSMakeDir(client, block, path, errorMask); @@ -175,7 +175,7 @@ DECL_FUNCTION(FSStatus, FSMakeDir, FSClient *client, FSCmdBlock *block, char *pa SYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSMakeDirAsync, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask, FSAsyncData *asyncData) { +DECL_FUNCTION(FSStatus, FSMakeDirAsync, FSClient *client, FSCmdBlock *block, const char *path, FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSMakeDirAsync(client, block, path, getRealErrorFlag(errorMask), asyncData); diff --git a/src/FSFileReplacements.cpp b/src/FSFileReplacements.cpp index 6273dd9..795ee93 100644 --- a/src/FSFileReplacements.cpp +++ b/src/FSFileReplacements.cpp @@ -21,7 +21,7 @@ DECL_FUNCTION(FSStatus, FSOpenFile, FSClient *client, FSCmdBlock *block, char *p SYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSOpenFileAsync, FSClient *client, FSCmdBlock *block, char *path, const char *mode, FSFileHandle *handle, FSErrorFlag errorMask, FSAsyncData *asyncData) { +DECL_FUNCTION(FSStatus, FSOpenFileAsync, FSClient *client, FSCmdBlock *block, const char *path, const char *mode, FSFileHandle *handle, FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSOpenFileAsync(client, block, path, mode, handle, getRealErrorFlag(errorMask), asyncData); @@ -88,7 +88,7 @@ DECL_FUNCTION(FSStatus, FSCloseFileAsync, FSClient *client, FSCmdBlock *block, F }); } -DECL_FUNCTION(FSStatus, FSGetStat, FSClient *client, FSCmdBlock *block, char *path, FSStat *stats, FSErrorFlag errorMask) { +DECL_FUNCTION(FSStatus, FSGetStat, FSClient *client, FSCmdBlock *block, const char *path, FSStat *stats, FSErrorFlag errorMask) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSGetStat(client, block, path, stats, errorMask); @@ -105,7 +105,7 @@ DECL_FUNCTION(FSStatus, FSGetStat, FSClient *client, FSCmdBlock *block, char *pa SYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSGetStatAsync, FSClient *client, FSCmdBlock *block, char *path, FSStat *stats, FSErrorFlag errorMask, FSAsyncData *asyncData) { +DECL_FUNCTION(FSStatus, FSGetStatAsync, FSClient *client, FSCmdBlock *block, const char *path, FSStat *stats, FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSGetStatAsync(client, block, path, stats, getRealErrorFlag(errorMask), asyncData); @@ -397,7 +397,7 @@ DECL_FUNCTION(FSStatus, FSTruncateFileAsync, FSClient *client, FSCmdBlock *block ASYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSRemove, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask) { +DECL_FUNCTION(FSStatus, FSRemove, FSClient *client, FSCmdBlock *block, const char *path, FSErrorFlag errorMask) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSRemove(client, block, path, errorMask); @@ -414,7 +414,7 @@ DECL_FUNCTION(FSStatus, FSRemove, FSClient *client, FSCmdBlock *block, char *pat SYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSRemoveAsync, FSClient *client, FSCmdBlock *block, char *path, [[maybe_unused]] FSErrorFlag errorMask, FSAsyncData *asyncData) { +DECL_FUNCTION(FSStatus, FSRemoveAsync, FSClient *client, FSCmdBlock *block, const char *path, [[maybe_unused]] FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_VERBOSE("%s", path); if (isForceRealFunction(errorMask)) { return real_FSRemoveAsync(client, block, path, getRealErrorFlag(errorMask), asyncData); @@ -431,7 +431,7 @@ DECL_FUNCTION(FSStatus, FSRemoveAsync, FSClient *client, FSCmdBlock *block, char ASYNC_RESULT_HANDLER); } -DECL_FUNCTION(FSStatus, FSRename, FSClient *client, FSCmdBlock *block, char *oldPath, char *newPath, FSErrorFlag errorMask) { +DECL_FUNCTION(FSStatus, FSRename, FSClient *client, FSCmdBlock *block, const char *oldPath, const char *newPath, FSErrorFlag errorMask) { DEBUG_FUNCTION_LINE_VERBOSE("%s -> %s", oldPath, newPath); if (isForceRealFunction(errorMask)) { return real_FSRename(client, block, oldPath, newPath, getRealErrorFlag(errorMask)); @@ -451,8 +451,8 @@ DECL_FUNCTION(FSStatus, FSRename, FSClient *client, FSCmdBlock *block, char *old DECL_FUNCTION(FSStatus, FSRenameAsync, FSClient *client, FSCmdBlock *block, - char *oldPath, - char *newPath, + const char *oldPath, + const char *newPath, FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_VERBOSE("%s -> %s", oldPath, newPath); @@ -508,7 +508,7 @@ DECL_FUNCTION(FSStatus, FSFlushFileAsync, FSClient *client, FSCmdBlock *block, [ DECL_FUNCTION(FSStatus, FSChangeModeAsync, FSClient *client, FSCmdBlock *block, - char *path, + const char *path, [[maybe_unused]] FSMode mode, [[maybe_unused]] FSMode modeMask, [[maybe_unused]] FSErrorFlag errorMask, @@ -517,7 +517,7 @@ DECL_FUNCTION(FSStatus, FSChangeModeAsync, return real_FSChangeModeAsync(client, block, path, mode, modeMask, errorMask, asyncData); } -DECL_FUNCTION(FSStatus, FSGetFreeSpaceSizeAsync, FSClient *client, FSCmdBlock *block, char *path, [[maybe_unused]] uint64_t *outSize, [[maybe_unused]] FSErrorFlag errorMask, FSAsyncData *asyncData) { +DECL_FUNCTION(FSStatus, FSGetFreeSpaceSizeAsync, FSClient *client, FSCmdBlock *block, const char *path, [[maybe_unused]] uint64_t *outSize, [[maybe_unused]] FSErrorFlag errorMask, FSAsyncData *asyncData) { DEBUG_FUNCTION_LINE_ERR("NOT IMPLEMENTED FSGetFreeSpaceSizeAsync %s", path); return real_FSGetFreeSpaceSizeAsync(client, block, path, outSize, errorMask, asyncData); } diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp index 75f4260..e5f47a2 100644 --- a/src/FileUtils.cpp +++ b/src/FileUtils.cpp @@ -16,7 +16,7 @@ std::map workingDirs; std::mutex fsLayerMutex; std::vector> fsLayers; -std::string getFullPathForClient(FSClient *pClient, char *path) { +std::string getFullPathForClient(FSClient *pClient, const char *path) { std::string res; if (path[0] != '/' && path[0] != '\\') { diff --git a/src/FileUtils.h b/src/FileUtils.h index 1110f9b..737dacd 100644 --- a/src/FileUtils.h +++ b/src/FileUtils.h @@ -38,7 +38,7 @@ static inline FSErrorFlag isForceRealFunction(FSErrorFlag flag) { void clearFSLayer(); -std::string getFullPathForClient(FSClient *pClient, char *path); +std::string getFullPathForClient(FSClient *pClient, const char *path); void setWorkingDir(FSClient *client, const char *path);