From bedc31347c112873ba991f669f6a5ae8740ef56c Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Mon, 16 Mar 2026 22:50:36 -0500 Subject: [PATCH] Move scope_guard to vendored/ --- src/fs_clonepath.cpp | 2 +- src/fs_copyfile.cpp | 2 +- src/fuse_readdir_cor_getdents.icpp | 2 +- src/fuse_readdir_cor_readdir.icpp | 2 +- src/fuse_readdir_cosr_getdents.icpp | 2 +- src/fuse_readdir_cosr_readdir.icpp | 2 +- src/fuse_readdir_seq_getdents.icpp | 2 +- src/fuse_readdir_seq_readdir.icpp | 2 +- src/fuse_write.cpp | 2 +- src/mergerfs_api.cpp | 2 +- src/mergerfs_collect_info.cpp | 2 +- src/procfs.cpp | 2 +- vendored/libfuse/include/mutex.hpp | 2 +- vendored/libfuse/lib/fuse_loop.cpp | 2 +- vendored/{libfuse/include => scope_guard}/scope_guard.hpp | 0 15 files changed, 14 insertions(+), 14 deletions(-) rename vendored/{libfuse/include => scope_guard}/scope_guard.hpp (100%) diff --git a/src/fs_clonepath.cpp b/src/fs_clonepath.cpp index 308ba879..1b7b4793 100644 --- a/src/fs_clonepath.cpp +++ b/src/fs_clonepath.cpp @@ -36,7 +36,7 @@ #include "fs_fchmod.hpp" #include "fs_futimens.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" static diff --git a/src/fs_copyfile.cpp b/src/fs_copyfile.cpp index 5938bd4e..6731abb7 100644 --- a/src/fs_copyfile.cpp +++ b/src/fs_copyfile.cpp @@ -34,7 +34,7 @@ #include "fs_unlink.hpp" #include "fs_xattr.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include #include diff --git a/src/fuse_readdir_cor_getdents.icpp b/src/fuse_readdir_cor_getdents.icpp index eacfdb7d..107de2b4 100644 --- a/src/fuse_readdir_cor_getdents.icpp +++ b/src/fuse_readdir_cor_getdents.icpp @@ -26,7 +26,7 @@ #include "hashset.hpp" #include "mutex.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "fuse_msgbuf.hpp" #include "fuse_dirents.hpp" diff --git a/src/fuse_readdir_cor_readdir.icpp b/src/fuse_readdir_cor_readdir.icpp index ee746ee9..ace92696 100644 --- a/src/fuse_readdir_cor_readdir.icpp +++ b/src/fuse_readdir_cor_readdir.icpp @@ -23,7 +23,7 @@ #include "fs_opendir.hpp" #include "fs_closedir.hpp" #include "hashset.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "fs_readdir.hpp" #include "fs_inode.hpp" diff --git a/src/fuse_readdir_cosr_getdents.icpp b/src/fuse_readdir_cosr_getdents.icpp index 942364d8..891ee0aa 100644 --- a/src/fuse_readdir_cosr_getdents.icpp +++ b/src/fuse_readdir_cosr_getdents.icpp @@ -27,7 +27,7 @@ #include "fs_open.hpp" #include "fs_path.hpp" #include "ugid.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "fuse_msgbuf.hpp" #include "fuse_dirents.hpp" diff --git a/src/fuse_readdir_cosr_readdir.icpp b/src/fuse_readdir_cosr_readdir.icpp index c786b309..3a41923d 100644 --- a/src/fuse_readdir_cosr_readdir.icpp +++ b/src/fuse_readdir_cosr_readdir.icpp @@ -24,7 +24,7 @@ #include "fs_opendir.hpp" #include "fs_readdir.hpp" #include "hashset.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "ugid.hpp" #include "fuse_dirents.hpp" diff --git a/src/fuse_readdir_seq_getdents.icpp b/src/fuse_readdir_seq_getdents.icpp index 1e5490d2..61ee8b69 100644 --- a/src/fuse_readdir_seq_getdents.icpp +++ b/src/fuse_readdir_seq_getdents.icpp @@ -25,7 +25,7 @@ #include "fs_inode.hpp" #include "fs_open.hpp" #include "hashset.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "fuse_dirents.hpp" #include "fuse_msgbuf.hpp" diff --git a/src/fuse_readdir_seq_readdir.icpp b/src/fuse_readdir_seq_readdir.icpp index 88e35bfe..0f8d0cdb 100644 --- a/src/fuse_readdir_seq_readdir.icpp +++ b/src/fuse_readdir_seq_readdir.icpp @@ -23,7 +23,7 @@ #include "fs_readdir.hpp" #include "error.hpp" #include "hashset.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "fs_inode.hpp" #include "dirinfo.hpp" diff --git a/src/fuse_write.cpp b/src/fuse_write.cpp index a1edd8f8..08403ebd 100644 --- a/src/fuse_write.cpp +++ b/src/fuse_write.cpp @@ -28,7 +28,7 @@ #include "fs_pwriten.hpp" #include "ioprio.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "fuse.h" diff --git a/src/mergerfs_api.cpp b/src/mergerfs_api.cpp index ef9a8212..6f73a8d9 100644 --- a/src/mergerfs_api.cpp +++ b/src/mergerfs_api.cpp @@ -23,7 +23,7 @@ #include "fs_lgetxattr.hpp" #include "str.hpp" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include #include diff --git a/src/mergerfs_collect_info.cpp b/src/mergerfs_collect_info.cpp index 9be2cee9..5680eb3e 100644 --- a/src/mergerfs_collect_info.cpp +++ b/src/mergerfs_collect_info.cpp @@ -25,7 +25,7 @@ #include "CLI11/CLI11.hpp" #include "fmt/core.h" #include "fmt/ranges.h" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "subprocess/subprocess.hpp" #include diff --git a/src/procfs.cpp b/src/procfs.cpp index f754aa0c..e00bb296 100644 --- a/src/procfs.cpp +++ b/src/procfs.cpp @@ -29,7 +29,7 @@ #include "fs_read.hpp" #include "fmt/core.h" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include #include diff --git a/vendored/libfuse/include/mutex.hpp b/vendored/libfuse/include/mutex.hpp index 119b4ce5..0f2cf302 100644 --- a/vendored/libfuse/include/mutex.hpp +++ b/vendored/libfuse/include/mutex.hpp @@ -6,7 +6,7 @@ #include "mutex_ndebug.hpp" #endif -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" typedef pthread_mutex_t mutex_t; diff --git a/vendored/libfuse/lib/fuse_loop.cpp b/vendored/libfuse/lib/fuse_loop.cpp index 1d9a6cb6..a85016a4 100644 --- a/vendored/libfuse/lib/fuse_loop.cpp +++ b/vendored/libfuse/lib/fuse_loop.cpp @@ -5,7 +5,7 @@ #include "cpu.hpp" #include "pin_threads.hpp" #include "fmt/core.h" -#include "scope_guard.hpp" +#include "scope_guard/scope_guard.hpp" #include "thread_pool.hpp" #include "syslog.hpp" #include "maintenance_thread.hpp" diff --git a/vendored/libfuse/include/scope_guard.hpp b/vendored/scope_guard/scope_guard.hpp similarity index 100% rename from vendored/libfuse/include/scope_guard.hpp rename to vendored/scope_guard/scope_guard.hpp