From dea69815efdd330096888ce2e8f7a54518c705e2 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 24 Jan 2025 08:24:03 -0600 Subject: [PATCH] refactor event system --- .../librepertory/src/drives/fuse/remotefuse/remote_server.cpp | 3 ++- .../src/drives/winfsp/remotewinfsp/remote_server.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp index 0041d7a0..ca917165 100644 --- a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp +++ b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp @@ -37,6 +37,7 @@ #include "utils/file.hpp" #include "utils/path.hpp" #include "utils/time.hpp" +#include "utils/utils.hpp" namespace repertory::remote_fuse { #define RAISE_REMOTE_FUSE_SERVER_EVENT(func, file, ret) \ @@ -44,7 +45,7 @@ namespace repertory::remote_fuse { (((config_.get_event_level() >= remote_server_event::level) && \ ((ret) < 0)) || \ (config_.get_event_level() >= event_level::trace))) \ - event_system::instance().raise(file, func, ret) + event_system::instance().raise(file, ret, func) remote_server::remote_server(app_config &config, i_fuse_drive &drive, const std::string &mount_location) diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp index 2dedd6dc..c0cac798 100644 --- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp +++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp @@ -42,6 +42,7 @@ #include "utils/file_utils.hpp" #include "utils/path.hpp" #include "utils/time.hpp" +#include "utils/utils.hpp" namespace repertory::remote_winfsp { #define RAISE_REMOTE_WINFSP_SERVER_EVENT(func, file, ret) \ @@ -49,7 +50,7 @@ namespace repertory::remote_winfsp { (((config_.get_event_level() >= remote_server_event::level) && \ ((ret) != STATUS_SUCCESS)) || \ (config_.get_event_level() >= event_level::trace))) \ - event_system::instance().raise(file, func, ret) + event_system::instance().raise(file, ret, func) auto remote_server::get_next_handle() -> std::uint64_t { if (++next_handle_ == 0U) {