updated build system

.cspell/words.txt

@@ -17,6 +17,7 @@ bugprone
 cflags
 chrono
 cmake_current_source_dir
+coinit_apartmentthreaded
 comdlg32
 cppcoreguidelines
 cppdbg

CHANGELOG.md

@@ -15,10 +15,12 @@
 * \#46 [bug] Changes to maximum cache size should be updated live
 * \#47 [bug] Windows-to-Linux remote mount is allowing directory rename when directory is not empty
 * \#48 [bug] Windows-to-Linux remote mount overlapped I/O is not detecting EOF for read operations
+* \#49 [ui] Implement provider test button
 
 ### Changes from v2.0.5-rc
 
 * Drive letters in UI should always be lowercase
+* Fixed WinFSP directory rename for non-empty directories
 * Migrated to v2 error handling
 
 ## v2.0.5-rc

cmake/hashes.cmake

@@ -1,10 +1,10 @@
 set(BINUTILS_HASH ce2017e059d63e67ddb9240e9d4ec49c2893605035cd60e92ad53177f4377237)
-set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
 set(BOOST_HASH 3621533e820dcab1e8012afd583c0c73cf0f77694952b81352bf38c1488f9cb4)
+set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
 set(CPP_HTTPLIB_HASH 18064587e0cc6a0d5d56d619f4cbbcaba47aa5d84d86013abbd45d95c6653866)
 set(CURL_HASH ccc5ba45d9f5320c70ffb24e5411b66ba55ea1f333bf78be0963ed90a9328699)
 set(EXPAT_HASH 85372797ff0673a8fc4a6be16466bb5a0ca28c0dcf3c6f7ac1686b4a3ba2aabb)
-set(GCC_HASH 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293)
+set(GCC_HASH 51b9919ea69c980d7a381db95d4be27edf73b21254eb13d752a08003b4d013b1)
 set(GTEST_HASH 78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399)
 set(ICU_HASH a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2)
 set(JSON_HASH 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187)

cmake/versions.cmake

@@ -1,28 +1,27 @@
 set(BINUTILS_VERSION 2.44)
-set(BOOST2_MAJOR_VERSION 1)
-set(BOOST2_MINOR_VERSION 76)
-set(BOOST2_PATCH_VERSION 0)
 set(BOOST_MAJOR_VERSION 1)
 set(BOOST_MINOR_VERSION 88)
 set(BOOST_PATCH_VERSION 0)
+set(BOOST2_MAJOR_VERSION 1)
+set(BOOST2_MINOR_VERSION 76)
+set(BOOST2_PATCH_VERSION 0)
 set(CPP_HTTPLIB_VERSION 0.20.0)
-set(CURL2_VERSION 8_13_0)
 set(CURL_VERSION 8.13.0)
-set(EXPAT2_VERSION 2_7_1)
+set(CURL2_VERSION 8_13_0)
 set(EXPAT_VERSION 2.7.1)
-set(GCC_VERSION 14.2.0)
+set(EXPAT2_VERSION 2_7_1)
+set(GCC_VERSION 15.1.0)
 set(GTEST_VERSION 1.16.0)
 set(ICU_VERSION 76-1)
 set(JSON_VERSION 3.12.0)
 set(LIBSODIUM_VERSION 1.0.20)
-set(MESA_VERSION 23.3.3)
 set(MINGW_VERSION 12.0.0)
 set(OPENSSL_VERSION 3.5.0)
 set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.15)
 set(ROCKSDB_VERSION 10.0.1)
 set(SPDLOG_VERSION 1.15.2)
-set(SQLITE2_VERSION 3.49.1)
 set(SQLITE_VERSION 3490100)
+set(SQLITE2_VERSION 3.49.1)
 set(STDUUID_VERSION 1.2.3)
 set(ZLIB_VERSION 1.3.1)

repertory/librepertory/include/comm/curl/curl_comm.hpp

@@ -53,9 +53,6 @@ private:
   std::optional<host_config> host_config_;
   std::optional<s3_config> s3_config_;
 
-private:
-  bool use_s3_path_style_{false};
-
 public:
   [[nodiscard]] static auto create_curl() -> CURL *;
 
@@ -67,8 +64,7 @@ public:
                                           const host_config &cfg)
       -> std::string;
 
-  [[nodiscard]] static auto create_host_config(const s3_config &cfg,
-                                               bool use_s3_path_style)
+  [[nodiscard]] static auto create_host_config(const s3_config &cfg)
       -> host_config;
 
   [[nodiscard]] static auto url_encode(CURL *curl, const std::string &data,
@@ -237,8 +233,6 @@ public:
   }
 
 public:
-  void enable_s3_path_style(bool enable) override;
-
   [[nodiscard]] auto make_request(const curl::requests::http_delete &del,
                                   long &response_code,
                                   stop_type &stop_requested) const

repertory/librepertory/include/comm/i_http_comm.hpp

@@ -34,28 +34,29 @@ struct i_http_comm {
   INTERFACE_SETUP(i_http_comm);
 
 public:
-  virtual void enable_s3_path_style(bool enable) = 0;
-
   [[nodiscard]] virtual auto
   make_request(const curl::requests::http_delete &del, long &response_code,
                stop_type &stop_requested) const -> bool = 0;
 
-  [[nodiscard]] virtual auto
-  make_request(const curl::requests::http_get &get, long &response_code,
-               stop_type &stop_requested) const -> bool = 0;
+  [[nodiscard]] virtual auto make_request(const curl::requests::http_get &get,
+                                          long &response_code,
+                                          stop_type &stop_requested) const
+      -> bool = 0;
 
-  [[nodiscard]] virtual auto
-  make_request(const curl::requests::http_head &head, long &response_code,
-               stop_type &stop_requested) const -> bool = 0;
+  [[nodiscard]] virtual auto make_request(const curl::requests::http_head &head,
+                                          long &response_code,
+                                          stop_type &stop_requested) const
+      -> bool = 0;
 
-  [[nodiscard]] virtual auto
-  make_request(const curl::requests::http_post &post, long &response_code,
-               stop_type &stop_requested) const -> bool = 0;
+  [[nodiscard]] virtual auto make_request(const curl::requests::http_post &post,
+                                          long &response_code,
+                                          stop_type &stop_requested) const
+      -> bool = 0;
 
   [[nodiscard]] virtual auto
   make_request(const curl::requests::http_put_file &put_file,
-               long &response_code,
-               stop_type &stop_requested) const -> bool = 0;
+               long &response_code, stop_type &stop_requested) const
+      -> bool = 0;
 };
 } // namespace repertory
 

repertory/librepertory/include/comm/packet/client_pool.hpp

@@ -94,7 +94,7 @@ private:
   bool shutdown_ = false;
 
 private:
-  static constexpr const auto min_pool_size = 10U;
+  static constexpr auto min_pool_size = 10U;
 
 public:
   void execute(const std::string &client_id, std::uint64_t thread_id,

repertory/librepertory/include/common.hpp

@@ -54,13 +54,13 @@ REPERTORY_IGNORE_WARNINGS_DISABLE()
 using namespace std::chrono_literals;
 using json = nlohmann::json;
 
-inline constexpr const std::string_view REPERTORY{"repertory"};
-inline constexpr const std::string_view REPERTORY_DATA_NAME{"repertory2"};
-inline constexpr const std::wstring_view REPERTORY_W{L"repertory"};
+inline constexpr std::string_view REPERTORY{"repertory"};
+inline constexpr std::string_view REPERTORY_DATA_NAME{"repertory2"};
+inline constexpr std::wstring_view REPERTORY_W{L"repertory"};
 
-inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION{2ULL};
-inline constexpr const std::string_view REPERTORY_MIN_REMOTE_VERSION{"2.0.0"};
-inline constexpr const std::string_view RENTERD_MIN_VERSION{"2.0.0"};
+inline constexpr std::uint64_t REPERTORY_CONFIG_VERSION{2ULL};
+inline constexpr std::string_view REPERTORY_MIN_REMOTE_VERSION{"2.0.0"};
+inline constexpr std::string_view RENTERD_MIN_VERSION{"2.0.0"};
 
 #define REPERTORY_INVALID_HANDLE INVALID_HANDLE_VALUE
 

repertory/librepertory/include/drives/directory_iterator.hpp

@@ -50,14 +50,14 @@ public:
   [[nodiscard]] auto fill_buffer(const remote::file_offset &offset,
                                  fuse_fill_dir_t filler_function, void *buffer,
                                  populate_stat_callback populate_stat) -> int;
-#endif
+#endif // !defined(_WIN32)
 
   [[nodiscard]] auto get(std::size_t offset, std::string &item) -> int;
 
   [[nodiscard]] auto get_count() const -> std::size_t { return items_.size(); }
 
-  [[nodiscard]] auto get_directory_item(std::size_t offset,
-                                        directory_item &di) -> api_error;
+  [[nodiscard]] auto get_directory_item(std::size_t offset, directory_item &di)
+      -> api_error;
 
   [[nodiscard]] auto get_directory_item(const std::string &api_path,
                                         directory_item &di) -> api_error;
@@ -71,8 +71,8 @@ public:
   auto operator=(const directory_iterator &iterator) noexcept
       -> directory_iterator &;
 
-  auto
-  operator=(directory_iterator &&iterator) noexcept -> directory_iterator &;
+  auto operator=(directory_iterator &&iterator) noexcept
+      -> directory_iterator &;
 
   auto operator=(directory_item_list list) noexcept -> directory_iterator &;
 };

repertory/librepertory/include/drives/fuse/fuse_base.hpp

@@ -78,9 +78,9 @@ private:
   static void execute_void_callback(std::string_view function_name,
                                     const std::function<void()> &cb);
 
-  static auto
-  execute_void_pointer_callback(std::string_view function_name,
-                                const std::function<void *()> &cb) -> void *;
+  static auto execute_void_pointer_callback(std::string_view function_name,
+                                            const std::function<void *()> &cb)
+      -> void *;
 
   void raise_fuse_event(std::string_view function_name,
                         std::string_view api_path, int ret,
@@ -91,22 +91,22 @@ private:
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto chflags_(const char *path, uint32_t flags) -> int;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto chmod_(const char *path, mode_t mode,
                                    struct fuse_file_info *fi) -> int;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto chmod_(const char *path, mode_t mode) -> int;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto chown_(const char *path, uid_t uid, gid_t gid,
                                    struct fuse_file_info *fi) -> int;
-#else
-  [[nodiscard]] static auto chown_(const char *path, uid_t uid,
-                                   gid_t gid) -> int;
-#endif
+#else  // FUSE_USE_VERSION < 30
+  [[nodiscard]] static auto chown_(const char *path, uid_t uid, gid_t gid)
+      -> int;
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] static auto create_(const char *path, mode_t mode,
                                     struct fuse_file_info *fi) -> int;
@@ -114,19 +114,19 @@ private:
   static void destroy_(void *ptr);
 
   [[nodiscard]] static auto fallocate_(const char *path, int mode, off_t offset,
-                                       off_t length,
-                                       struct fuse_file_info *fi) -> int;
+                                       off_t length, struct fuse_file_info *fi)
+      -> int;
 
 #if FUSE_USE_VERSION < 30
   [[nodiscard]] static auto fgetattr_(const char *path, struct stat *st,
                                       struct fuse_file_info *fi) -> int;
-#endif
+#endif // FUSE_USE_VERSION < 30
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto fsetattr_x_(const char *path,
                                         struct setattr_x *attr,
                                         struct fuse_file_info *fi) -> int;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
   [[nodiscard]] static auto fsync_(const char *path, int datasync,
                                    struct fuse_file_info *fi) -> int;
@@ -137,27 +137,27 @@ private:
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto getattr_(const char *path, struct stat *st,
                                      struct fuse_file_info *fi) -> int;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto getattr_(const char *path, struct stat *st) -> int;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto getxtimes_(const char *path,
                                        struct timespec *bkuptime,
                                        struct timespec *crtime) -> int;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto init_(struct fuse_conn_info *conn,
                                   struct fuse_config *cfg) -> void *;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto init_(struct fuse_conn_info *conn) -> void *;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] static auto mkdir_(const char *path, mode_t mode) -> int;
 
-  [[nodiscard]] static auto open_(const char *path,
-                                  struct fuse_file_info *fi) -> int;
+  [[nodiscard]] static auto open_(const char *path, struct fuse_file_info *fi)
+      -> int;
 
   [[nodiscard]] static auto opendir_(const char *path,
                                      struct fuse_file_info *fi) -> int;
@@ -171,12 +171,12 @@ private:
                                      fuse_fill_dir_t fuse_fill_dir,
                                      off_t offset, struct fuse_file_info *fi,
                                      fuse_readdir_flags flags) -> int;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto readdir_(const char *path, void *buf,
                                      fuse_fill_dir_t fuse_fill_dir,
-                                     off_t offset,
-                                     struct fuse_file_info *fi) -> int;
-#endif
+                                     off_t offset, struct fuse_file_info *fi)
+      -> int;
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] static auto release_(const char *path,
                                      struct fuse_file_info *fi) -> int;
@@ -187,9 +187,9 @@ private:
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto rename_(const char *from, const char *to,
                                     unsigned int flags) -> int;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto rename_(const char *from, const char *to) -> int;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] static auto rmdir_(const char *path) -> int;
 
@@ -199,35 +199,36 @@ private:
                                       char *value, size_t size,
                                       uint32_t position) -> int;
 
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
   [[nodiscard]] static auto getxattr_(const char *path, const char *name,
                                       char *value, size_t size) -> int;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
   [[nodiscard]] static auto listxattr_(const char *path, char *buffer,
                                        size_t size) -> int;
 
-  [[nodiscard]] static auto removexattr_(const char *path,
-                                         const char *name) -> int;
+  [[nodiscard]] static auto removexattr_(const char *path, const char *name)
+      -> int;
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto setxattr_(const char *path, const char *name,
                                       const char *value, size_t size, int flags,
                                       uint32_t position) -> int;
 
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
   [[nodiscard]] static auto setxattr_(const char *path, const char *name,
-                                      const char *value, size_t size,
-                                      int flags) -> int;
-#endif // __APPLE__
-#endif // HAS_SETXATTR
+                                      const char *value, size_t size, int flags)
+      -> int;
+#endif // defined(__APPLE__)
+#endif // defined(HAS_SETXATTR)
 
 #if defined(__APPLE__)
-  [[nodiscard]] static auto setattr_x_(const char *path,
-                                       struct setattr_x *attr) -> int;
+  [[nodiscard]] static auto setattr_x_(const char *path, struct setattr_x *attr)
+      -> int;
 
-  [[nodiscard]] static auto
-  setbkuptime_(const char *path, const struct timespec *bkuptime) -> int;
+  [[nodiscard]] static auto setbkuptime_(const char *path,
+                                         const struct timespec *bkuptime)
+      -> int;
 
   [[nodiscard]] static auto setchgtime_(const char *path,
                                         const struct timespec *chgtime) -> int;
@@ -237,20 +238,20 @@ private:
 
   [[nodiscard]] static auto setvolname_(const char *volname) -> int;
 
-  [[nodiscard]] static auto statfs_x_(const char *path,
-                                      struct statfs *stbuf) -> int;
+  [[nodiscard]] static auto statfs_x_(const char *path, struct statfs *stbuf)
+      -> int;
 
-#else  // __APPLE__
-  [[nodiscard]] static auto statfs_(const char *path,
-                                    struct statvfs *stbuf) -> int;
-#endif // __APPLE__
+#else  // !defined(__APPLE__)
+  [[nodiscard]] static auto statfs_(const char *path, struct statvfs *stbuf)
+      -> int;
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto truncate_(const char *path, off_t size,
                                       struct fuse_file_info *fi) -> int;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto truncate_(const char *path, off_t size) -> int;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] static auto unlink_(const char *path) -> int;
 
@@ -258,18 +259,18 @@ private:
   [[nodiscard]] static auto utimens_(const char *path,
                                      const struct timespec tv[2],
                                      struct fuse_file_info *fi) -> int;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] static auto utimens_(const char *path,
                                      const struct timespec tv[2]) -> int;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] static auto write_(const char *path, const char *buffer,
                                    size_t write_size, off_t write_offset,
                                    struct fuse_file_info *fi) -> int;
 
 protected:
-  [[nodiscard]] virtual auto access_impl(std::string /*api_path*/,
-                                         int /*mask*/) -> api_error {
+  [[nodiscard]] virtual auto access_impl(std::string /*api_path*/, int /*mask*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -278,37 +279,40 @@ protected:
                                           uint32_t /*flags*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto
-  chmod_impl(std::string /*api_path*/, mode_t /*mode*/,
-             struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto chmod_impl(std::string /*api_path*/,
+                                        mode_t /*mode*/,
+                                        struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else
+#else //FUSE_USE_VERSION < 30
   [[nodiscard]] virtual auto chmod_impl(std::string /*api_path*/,
                                         mode_t /*mode*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto
-  chown_impl(std::string /*api_path*/, uid_t /*uid*/, gid_t /*gid*/,
-             struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto chown_impl(std::string /*api_path*/, uid_t /*uid*/,
+                                        gid_t /*gid*/,
+                                        struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else
+#else // FUSE_USE_VERSION < 30
   [[nodiscard]] virtual auto chown_impl(std::string /*api_path*/, uid_t /*uid*/,
                                         gid_t /*gid*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
-  [[nodiscard]] virtual auto
-  create_impl(std::string /*api_path*/, mode_t /*mode*/,
-              struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto create_impl(std::string /*api_path*/,
+                                         mode_t /*mode*/,
+                                         struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -316,81 +320,87 @@ protected:
 
   [[nodiscard]] virtual auto
   fallocate_impl(std::string /*api_path*/, int /*mode*/, off_t /*offset*/,
-                 off_t /*length*/,
-                 struct fuse_file_info * /*fi*/) -> api_error {
+                 off_t /*length*/, struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  fgetattr_impl(std::string /*api_path*/, struct stat * /*st*/,
-                struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto fgetattr_impl(std::string /*api_path*/,
+                                           struct stat * /*st*/,
+                                           struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto
-  fsetattr_x_impl(std::string /*api_path*/, struct setattr_x * /*attr*/,
-                  struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto fsetattr_x_impl(std::string /*api_path*/,
+                                             struct setattr_x * /*attr*/,
+                                             struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
-  [[nodiscard]] virtual auto
-  fsync_impl(std::string /*api_path*/, int /*datasync*/,
-             struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto fsync_impl(std::string /*api_path*/,
+                                        int /*datasync*/,
+                                        struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
 #if FUSE_USE_VERSION < 30
-  [[nodiscard]] virtual auto
-  ftruncate_impl(std::string /*api_path*/, off_t /*size*/,
-                 struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto ftruncate_impl(std::string /*api_path*/,
+                                            off_t /*size*/,
+                                            struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION < 30
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto
-  getattr_impl(std::string /*api_path*/, struct stat * /*st*/,
-               struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto getattr_impl(std::string /*api_path*/,
+                                          struct stat * /*st*/,
+                                          struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else
+#else // FUSE_USE_VERSION < 30
   [[nodiscard]] virtual auto getattr_impl(std::string /*api_path*/,
                                           struct stat * /*st*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto
-  getxtimes_impl(std::string /*api_path*/, struct timespec * /*bkuptime*/,
-                 struct timespec * /*crtime*/) -> api_error {
+  [[nodiscard]] virtual auto getxtimes_impl(std::string /*api_path*/,
+                                            struct timespec * /*bkuptime*/,
+                                            struct timespec * /*crtime*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
-  virtual auto init_impl(struct fuse_conn_info *conn,
-                         struct fuse_config *cfg) -> void *;
-#else
+  virtual auto init_impl(struct fuse_conn_info *conn, struct fuse_config *cfg)
+      -> void *;
+#else // FUSE_USE_VERSION < 30
   virtual auto init_impl(struct fuse_conn_info *conn) -> void *;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] virtual auto mkdir_impl(std::string /*api_path*/,
                                         mode_t /*mode*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  open_impl(std::string /*api_path*/,
-            struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto open_impl(std::string /*api_path*/,
+                                       struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  opendir_impl(std::string /*api_path*/,
-               struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto opendir_impl(std::string /*api_path*/,
+                                          struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -405,28 +415,28 @@ protected:
   [[nodiscard]] virtual auto
   readdir_impl(std::string /*api_path*/, void * /*buf*/,
                fuse_fill_dir_t /*fuse_fill_dir*/, off_t /*offset*/,
-               struct fuse_file_info * /*fi*/,
-               fuse_readdir_flags /*flags*/) -> api_error {
+               struct fuse_file_info * /*fi*/, fuse_readdir_flags /*flags*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else
+#else // FUSE_USE_VERSION < 30
   [[nodiscard]] virtual auto
   readdir_impl(std::string /*api_path*/, void * /*buf*/,
                fuse_fill_dir_t /*fuse_fill_dir*/, off_t /*offset*/,
                struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
-  [[nodiscard]] virtual auto
-  release_impl(std::string /*api_path*/,
-               struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto release_impl(std::string /*api_path*/,
+                                          struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  releasedir_impl(std::string /*api_path*/,
-                  struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto releasedir_impl(std::string /*api_path*/,
+                                             struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -436,13 +446,13 @@ protected:
                                          unsigned int /*flags*/) -> api_error {
     return api_error::not_implemented;
   }
-#else
-  [[nodiscard]] virtual auto
-  rename_impl(std::string /*from_api_path*/,
-              std::string /*to_api_path*/) -> api_error {
+#else // FUSE_USE_VERSION < 30
+  [[nodiscard]] virtual auto rename_impl(std::string /*from_api_path*/,
+                                         std::string /*to_api_path*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] virtual auto rmdir_impl(std::string /*api_path*/) -> api_error {
     return api_error::not_implemented;
@@ -456,14 +466,14 @@ protected:
                 int & /*attribute_size*/) -> api_error {
     return api_error::not_implemented;
   }
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
   [[nodiscard]] virtual auto
   getxattr_impl(std::string /*api_path*/, const char * /*name*/,
-                char * /*value*/, size_t /*size*/,
-                int & /*attribute_size*/) -> api_error {
+                char * /*value*/, size_t /*size*/, int & /*attribute_size*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
   [[nodiscard]] virtual auto
   listxattr_impl(std::string /*api_path*/, char * /*buffer*/, size_t /*size*/,
@@ -471,9 +481,9 @@ protected:
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  removexattr_impl(std::string /*api_path*/,
-                   const char * /*name*/) -> api_error {
+  [[nodiscard]] virtual auto removexattr_impl(std::string /*api_path*/,
+                                              const char * /*name*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -485,21 +495,20 @@ protected:
                                            uint32_t /*position*/) -> api_error {
     return api_error::not_implemented;
   }
-#else  // __APPLE__
-  [[nodiscard]] virtual auto setxattr_impl(std::string /*api_path*/,
-                                           const char * /*name*/,
-                                           const char * /*value*/,
-                                           size_t /*size*/,
-                                           int /*flags*/) -> api_error {
+#else  // !defined (__APPLE__)
+  [[nodiscard]] virtual auto
+  setxattr_impl(std::string /*api_path*/, const char * /*name*/,
+                const char * /*value*/, size_t /*size*/, int /*flags*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif // __APPLE__
-#endif // HAS_SETXATTR
+#endif // defined (__APPLE__)
+#endif // defined(HAS_SETXATTR)
 
 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto
-  setattr_x_impl(std::string /*api_path*/,
-                 struct setattr_x * /*attr*/) -> api_error {
+  [[nodiscard]] virtual auto setattr_x_impl(std::string /*api_path*/,
+                                            struct setattr_x * /*attr*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -510,72 +519,74 @@ protected:
   }
 
   [[nodiscard]] virtual auto
-  setchgtime_impl(std::string /*api_path*/,
-                  const struct timespec * /*chgtime*/) -> api_error {
+  setchgtime_impl(std::string /*api_path*/, const struct timespec * /*chgtime*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  setcrtime_impl(std::string /*api_path*/,
-                 const struct timespec * /*crtime*/) -> api_error {
+  [[nodiscard]] virtual auto setcrtime_impl(std::string /*api_path*/,
+                                            const struct timespec * /*crtime*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  setvolname_impl(const char * /*volname*/) -> api_error {
+  [[nodiscard]] virtual auto setvolname_impl(const char * /*volname*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto
-  statfs_x_impl(std::string /*api_path*/,
-                struct statfs * /*stbuf*/) -> api_error {
+  [[nodiscard]] virtual auto statfs_x_impl(std::string /*api_path*/,
+                                           struct statfs * /*stbuf*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else  // __APPLE__
-  [[nodiscard]] virtual auto
-  statfs_impl(std::string /*api_path*/,
-              struct statvfs * /*stbuf*/) -> api_error {
+#else  // !defined(__APPLE__)
+  [[nodiscard]] virtual auto statfs_impl(std::string /*api_path*/,
+                                         struct statvfs * /*stbuf*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto
-  truncate_impl(std::string /*api_path*/, off_t /*size*/,
-                struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto truncate_impl(std::string /*api_path*/,
+                                           off_t /*size*/,
+                                           struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else
+#else // FUSE_USE_VERSION < 30
   [[nodiscard]] virtual auto truncate_impl(std::string /*api_path*/,
                                            off_t /*size*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
-  [[nodiscard]] virtual auto
-  unlink_impl(std::string /*api_path*/) -> api_error {
+  [[nodiscard]] virtual auto unlink_impl(std::string /*api_path*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto
-  utimens_impl(std::string /*api_path*/, const struct timespec /*tv*/[2],
-               struct fuse_file_info * /*fi*/) -> api_error {
+  [[nodiscard]] virtual auto utimens_impl(std::string /*api_path*/,
+                                          const struct timespec /*tv*/[2],
+                                          struct fuse_file_info * /*fi*/)
+      -> api_error {
     return api_error::not_implemented;
   }
-#else
-  [[nodiscard]] virtual auto
-  utimens_impl(std::string /*api_path*/,
-               const struct timespec /*tv*/[2]) -> api_error {
+#else // FUSE_USE_VERSION < 30
+  [[nodiscard]] virtual auto utimens_impl(std::string /*api_path*/,
+                                          const struct timespec /*tv*/[2])
+      -> api_error {
     return api_error::not_implemented;
   }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] virtual auto
   write_impl(std::string /*api_path*/, const char * /*buffer*/,
              size_t /*write_size*/, off_t /*write_offset*/,
-             struct fuse_file_info * /*fi*/,
-             std::size_t & /*bytes_written*/) -> api_error {
+             struct fuse_file_info * /*fi*/, std::size_t & /*bytes_written*/)
+      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -603,5 +614,5 @@ public:
 };
 } // namespace repertory
 
-#endif // _WIN32
+#endif // !defined(_WIN32)
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_BASE_HPP_

repertory/librepertory/include/drives/fuse/fuse_drive.hpp

@@ -75,25 +75,25 @@ protected:
 #if defined(__APPLE__)
   [[nodiscard]] auto chflags_impl(std::string api_path, uint32_t flags)
       -> api_error override;
-#endif // __APPLE__
+#endif // defined(__APPLE__{}
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode,
                                 struct fuse_file_info *file_info)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode)
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid,
                                 struct fuse_file_info *file_info)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid)
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] auto create_impl(std::string api_path, mode_t mode,
                                  struct fuse_file_info *file_info)
@@ -115,7 +115,7 @@ protected:
                                      struct setattr_x *attr,
                                      struct fuse_file_info *file_info)
       -> api_error override;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
   [[nodiscard]] auto fsync_impl(std::string api_path, int datasync,
                                 struct fuse_file_info *file_info)
@@ -125,30 +125,30 @@ protected:
   [[nodiscard]] auto ftruncate_impl(std::string api_path, off_t size,
                                     struct fuse_file_info *file_info)
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION < 30
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st,
                                   struct fuse_file_info *file_info)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st)
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if defined(__APPLE__)
   [[nodiscard]] auto getxtimes_impl(std::string api_path,
                                     struct timespec *bkuptime,
                                     struct timespec *crtime)
       -> api_error override;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
   auto init_impl(struct fuse_conn_info *conn, struct fuse_config *cfg)
       -> void * override;
-#else
+#else  // FUSE_USE_VERSION < 30
   auto init_impl(struct fuse_conn_info *conn) -> void * override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] auto mkdir_impl(std::string api_path, mode_t mode)
       -> api_error override;
@@ -174,12 +174,12 @@ protected:
                                   struct fuse_file_info *file_info,
                                   fuse_readdir_flags flags)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
                                   fuse_fill_dir_t fuse_fill_dir, off_t offset,
                                   struct fuse_file_info *file_info)
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] auto release_impl(std::string api_path,
                                   struct fuse_file_info *file_info)
@@ -193,10 +193,10 @@ protected:
   [[nodiscard]] auto rename_impl(std::string from_api_path,
                                  std::string to_api_path, unsigned int flags)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto rename_impl(std::string from_api_path,
                                  std::string to_api_path) -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] auto rmdir_impl(std::string api_path) -> api_error override;
 
@@ -210,11 +210,11 @@ protected:
   [[nodiscard]] auto getxattr_impl(std::string api_path, const char *name,
                                    char *value, size_t size, uint32_t position,
                                    int &attribute_size) -> api_error override;
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
   [[nodiscard]] auto getxattr_impl(std::string api_path, const char *name,
                                    char *value, size_t size,
                                    int &attribute_size) -> api_error override;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
   [[nodiscard]] auto listxattr_impl(std::string api_path, char *buffer,
                                     size_t size, int &required_size,
@@ -227,12 +227,12 @@ protected:
   [[nodiscard]] auto setxattr_impl(std::string api_path, const char *name,
                                    const char *value, size_t size, int flags,
                                    uint32_t position) -> api_error override;
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
   [[nodiscard]] auto setxattr_impl(std::string api_path, const char *name,
                                    const char *value, size_t size, int flags)
       -> api_error override;
-#endif // __APPLE__
-#endif // HAS_SETXATTR
+#endif // defined(__APPLE__)
+#endif // defined(HAS_SETXATTR{}
 
 #if defined(__APPLE__)
   [[nodiscard]] auto setattr_x_impl(std::string api_path,
@@ -255,19 +255,19 @@ protected:
 
   [[nodiscard]] auto statfs_x_impl(std::string api_path, struct statfs *stbuf)
       -> api_error override;
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
   [[nodiscard]] auto statfs_impl(std::string api_path, struct statvfs *stbuf)
       -> api_error override;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto truncate_impl(std::string api_path, off_t size,
                                    struct fuse_file_info *file_info)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto truncate_impl(std::string api_path, off_t size)
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] auto unlink_impl(std::string api_path) -> api_error override;
 
@@ -276,11 +276,11 @@ protected:
                                   const struct timespec tv[2],
                                   struct fuse_file_info *file_info)
       -> api_error override;
-#else
+#else  // FUSE_USE_VERSION < 30
   [[nodiscard]] auto utimens_impl(std::string api_path,
                                   const struct timespec tv[2])
       -> api_error override;
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   [[nodiscard]] auto write_impl(std::string api_path, const char *buffer,
                                 size_t write_size, off_t write_offset,
@@ -335,5 +335,5 @@ public:
 };
 } // namespace repertory
 
-#endif // _WIN32
+#endif // !defined(_WIN32)
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_DRIVE_HPP_

repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp

@@ -43,16 +43,17 @@ public:
   auto operator=(fuse_drive_base &&) -> fuse_drive_base & = delete;
 
 protected:
-  [[nodiscard]] auto access_impl(std::string api_path,
-                                 int mask) -> api_error override;
+  [[nodiscard]] auto access_impl(std::string api_path, int mask)
+      -> api_error override;
 
 protected:
-  [[nodiscard]] auto check_access(const std::string &api_path,
-                                  int mask) const -> api_error;
+  [[nodiscard]] auto check_access(const std::string &api_path, int mask) const
+      -> api_error;
 
-  [[nodiscard]] auto check_and_perform(
-      const std::string &api_path, int parent_mask,
-      const std::function<api_error(api_meta_map &meta)> &action) -> api_error;
+  [[nodiscard]] auto
+  check_and_perform(const std::string &api_path, int parent_mask,
+                    const std::function<api_error(api_meta_map &meta)> &action)
+      -> api_error;
 
   [[nodiscard]] auto get_current_gid() const -> gid_t;
 
@@ -62,58 +63,63 @@ protected:
 
   [[nodiscard]] auto get_effective_uid() const -> uid_t;
 
-  [[nodiscard]] static auto
-  check_open_flags(int flags, int mask,
-                   const api_error &fail_error) -> api_error;
+  [[nodiscard]] static auto check_open_flags(int flags, int mask,
+                                             const api_error &fail_error)
+      -> api_error;
 
   [[nodiscard]] auto check_owner(const api_meta_map &meta) const -> api_error;
 
-  [[nodiscard]] static auto
-  check_readable(int flags, const api_error &fail_error) -> api_error;
+  [[nodiscard]] static auto check_readable(int flags,
+                                           const api_error &fail_error)
+      -> api_error;
 
-  [[nodiscard]] static auto
-  check_writeable(int flags, const api_error &fail_error) -> api_error;
+  [[nodiscard]] static auto check_writeable(int flags,
+                                            const api_error &fail_error)
+      -> api_error;
 
 #if defined(__APPLE__)
-  [[nodiscard]] static auto
-  get_flags_from_meta(const api_meta_map &meta) -> __uint32_t;
-#endif // __APPLE__
+  [[nodiscard]] static auto get_flags_from_meta(const api_meta_map &meta)
+      -> __uint32_t;
+#endif // defined(__APPLE__)
 
-  [[nodiscard]] static auto
-  get_gid_from_meta(const api_meta_map &meta) -> gid_t;
+  [[nodiscard]] static auto get_gid_from_meta(const api_meta_map &meta)
+      -> gid_t;
 
-  [[nodiscard]] static auto
-  get_mode_from_meta(const api_meta_map &meta) -> mode_t;
+  [[nodiscard]] static auto get_mode_from_meta(const api_meta_map &meta)
+      -> mode_t;
 
   static void get_timespec_from_meta(const api_meta_map &meta,
                                      const std::string &name,
                                      struct timespec &ts);
 
-  [[nodiscard]] static auto
-  get_uid_from_meta(const api_meta_map &meta) -> uid_t;
+  [[nodiscard]] static auto get_uid_from_meta(const api_meta_map &meta)
+      -> uid_t;
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto
-  parse_xattr_parameters(const char *name, const uint32_t &position,
+  [[nodiscard]] auto parse_xattr_parameters(const char *name,
+                                            const uint32_t &position,
                                             std::string &attribute_name,
-                         const std::string &api_path) -> api_error;
-#else
-  [[nodiscard]] auto
-  parse_xattr_parameters(const char *name, std::string &attribute_name,
-                         const std::string &api_path) -> api_error;
-#endif
+                                            const std::string &api_path)
+      -> api_error;
+#else  // !defined(__APPLE__)
+  [[nodiscard]] auto parse_xattr_parameters(const char *name,
+                                            std::string &attribute_name,
+                                            const std::string &api_path)
+      -> api_error;
+#endif // defined(__APPLE__)
 
 #if defined(__APPLE__)
   [[nodiscard]] auto
   parse_xattr_parameters(const char *name, const char *value, size_t size,
                          const uint32_t &position, std::string &attribute_name,
                          const std::string &api_path) -> api_error;
-#else
-  [[nodiscard]] auto
-  parse_xattr_parameters(const char *name, const char *value, size_t size,
+#else  // !defined(__APPLE__)
+  [[nodiscard]] auto parse_xattr_parameters(const char *name, const char *value,
+                                            size_t size,
                                             std::string &attribute_name,
-                         const std::string &api_path) -> api_error;
-#endif
+                                            const std::string &api_path)
+      -> api_error;
+#endif // defined(__APPLE__)
 
   static void populate_stat(const std::string &api_path,
                             std::uint64_t size_or_count,
@@ -125,13 +131,13 @@ protected:
                                      struct timespec &ts);
 
 public:
-  [[nodiscard]] auto
-  check_owner(const std::string &api_path) const -> api_error override;
+  [[nodiscard]] auto check_owner(const std::string &api_path) const
+      -> api_error override;
 
   [[nodiscard]] auto check_parent_access(const std::string &api_path,
                                          int mask) const -> api_error override;
 };
 } // namespace repertory
 
-#endif // _WIN32
+#endif // !defined(_WIN32)
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_DRIVE_BASE_HPP_

repertory/librepertory/include/drives/fuse/i_fuse_drive.hpp

@@ -86,5 +86,5 @@ public:
 };
 } // namespace repertory
 
-#endif
+#endif // !defined(_WIN32)
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_I_FUSE_DRIVE_HPP_

repertory/librepertory/include/drives/fuse/remotefuse/remote_client.hpp

@@ -38,10 +38,12 @@ public:
 private:
   const app_config &config_;
   packet_client packet_client_;
-  remote::user_id uid_ = 0;
-  remote::group_id gid_ = 0;
+  remote::user_id uid_{0};
+  remote::group_id gid_{0};
 
 public:
+  [[nodiscard]] auto check() -> packet::error_type;
+
   [[nodiscard]] auto fuse_access(const char *path, const std::int32_t &mask)
       -> packet::error_type override;
 
@@ -51,9 +53,9 @@ public:
   [[nodiscard]] auto fuse_chmod(const char *path, const remote::file_mode &mode)
       -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_chown(const char *path, const remote::user_id &uid,
-             const remote::group_id &gid) -> packet::error_type override;
+  [[nodiscard]] auto fuse_chown(const char *path, const remote::user_id &uid,
+                                const remote::group_id &gid)
+      -> packet::error_type override;
 
   [[nodiscard]] auto fuse_destroy() -> packet::error_type override;
 
@@ -67,21 +69,23 @@ public:
                 const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_fsetattr_x(
-      const char *path, const remote::setattr_x &attr,
-      const remote::file_handle &handle) -> packet::error_type override;
+  [[nodiscard]] auto fuse_fsetattr_x(const char *path,
+                                     const remote::setattr_x &attr,
+                                     const remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_fsync(const char *path, const std::int32_t &datasync,
-             const remote::file_handle &handle) -> packet::error_type override;
+  [[nodiscard]] auto fuse_fsync(const char *path, const std::int32_t &datasync,
+                                const remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_ftruncate(
-      const char *path, const remote::file_offset &size,
-      const remote::file_handle &handle) -> packet::error_type override;
+  [[nodiscard]] auto fuse_ftruncate(const char *path,
+                                    const remote::file_offset &size,
+                                    const remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_getattr(const char *path, remote::stat &st,
-               bool &directory) -> packet::error_type override;
+  [[nodiscard]] auto fuse_getattr(const char *path, remote::stat &st,
+                                  bool &directory)
+      -> packet::error_type override;
 
   /*[[nodiscard]] packet::error_type fuse_getxattr(const char *path, const char
   *name, char *value, const remote::file_size &size) override ;
@@ -90,9 +94,10 @@ public:
   *name, char *value, const remote::file_size &size, std::uint32_t position)
   override ;*/
 
-  [[nodiscard]] auto
-  fuse_getxtimes(const char *path, remote::file_time &bkuptime,
-                 remote::file_time &crtime) -> packet::error_type override;
+  [[nodiscard]] auto fuse_getxtimes(const char *path,
+                                    remote::file_time &bkuptime,
+                                    remote::file_time &crtime)
+      -> packet::error_type override;
 
   [[nodiscard]] auto fuse_init() -> packet::error_type override;
 
@@ -107,25 +112,27 @@ public:
 
   [[nodiscard]] auto
   fuse_create(const char *path, const remote::file_mode &mode,
+              const remote::open_flags &flags, remote::file_handle &handle)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto fuse_open(const char *path,
                                const remote::open_flags &flags,
-              remote::file_handle &handle) -> packet::error_type override;
+                               remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_open(const char *path, const remote::open_flags &flags,
-            remote::file_handle &handle) -> packet::error_type override;
-
-  [[nodiscard]] auto
-  fuse_read(const char *path, char *buffer, const remote::file_size &read_size,
+  [[nodiscard]] auto fuse_read(const char *path, char *buffer,
+                               const remote::file_size &read_size,
                                const remote::file_offset &read_offset,
-            const remote::file_handle &handle) -> packet::error_type override;
+                               const remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_rename(const char *from,
-                                 const char *to) -> packet::error_type override;
+  [[nodiscard]] auto fuse_rename(const char *from, const char *to)
+      -> packet::error_type override;
 
   [[nodiscard]] auto
   fuse_readdir(const char *path, const remote::file_offset &offset,
-               const remote::file_handle &handle,
-               std::string &item_path) -> packet::error_type override;
+               const remote::file_handle &handle, std::string &item_path)
+      -> packet::error_type override;
 
   [[nodiscard]] auto fuse_release(const char *path,
                                   const remote::file_handle &handle)
@@ -139,8 +146,8 @@ public:
    * char *name) override
    * ;*/
 
-  [[nodiscard]] auto
-  fuse_rmdir(const char *path) -> packet::error_type override;
+  [[nodiscard]] auto fuse_rmdir(const char *path)
+      -> packet::error_type override;
 
   [[nodiscard]] auto fuse_setattr_x(const char *path, remote::setattr_x &attr)
       -> packet::error_type override;
@@ -157,8 +164,8 @@ public:
                                     const remote::file_time &crtime)
       -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_setvolname(const char *volname) -> packet::error_type override;
+  [[nodiscard]] auto fuse_setvolname(const char *volname)
+      -> packet::error_type override;
 
   [[nodiscard]] /*packet::error_type fuse_setxattr(const char *path, const char
   *name, const char *value, const remote::file_size &size, const std::int32_t
@@ -169,45 +176,48 @@ public:
   std::int32_t &flags, std::uint32_t position) override ;*/
 
   [[nodiscard]] auto
-  fuse_statfs(const char *path, std::uint64_t frsize,
-              remote::statfs &st) -> packet::error_type override;
+  fuse_statfs(const char *path, std::uint64_t frsize, remote::statfs &st)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_statfs_x(const char *path, std::uint64_t bsize,
-                remote::statfs_x &st) -> packet::error_type override;
+  [[nodiscard]] auto fuse_statfs_x(const char *path, std::uint64_t bsize,
+                                   remote::statfs_x &st)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_truncate(const char *path,
-                const remote::file_offset &size) -> packet::error_type override;
+  [[nodiscard]] auto fuse_truncate(const char *path,
+                                   const remote::file_offset &size)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_unlink(const char *path) -> packet::error_type override;
+  [[nodiscard]] auto fuse_unlink(const char *path)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_utimens(const char *path, const remote::file_time *tv, std::uint64_t op0,
-               std::uint64_t op1) -> packet::error_type override;
+  [[nodiscard]] auto fuse_utimens(const char *path, const remote::file_time *tv,
+                                  std::uint64_t op0, std::uint64_t op1)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
-  fuse_write(const char *path, const char *buffer,
+  [[nodiscard]] auto fuse_write(const char *path, const char *buffer,
                                 const remote::file_size &write_size,
                                 const remote::file_offset &write_offset,
-             const remote::file_handle &handle) -> packet::error_type override;
+                                const remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_write_base64(
-      const char *path, const char *buffer, const remote::file_size &write_size,
+  [[nodiscard]] auto fuse_write_base64(const char *path, const char *buffer,
+                                       const remote::file_size &write_size,
                                        const remote::file_offset &write_offset,
-      const remote::file_handle &handle) -> packet::error_type override;
+                                       const remote::file_handle &handle)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto json_create_directory_snapshot(
-      const std::string &path, json &json_data) -> packet::error_type override;
+  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
+                                                    json &json_data)
+      -> packet::error_type override;
 
   [[nodiscard]] auto json_read_directory_snapshot(
       const std::string &path, const remote::file_handle &handle,
       std::uint32_t page, json &json_data) -> packet::error_type override;
 
-  [[nodiscard]] auto json_release_directory_snapshot(
-      const std::string &path,
-      const remote::file_handle &handle) -> packet::error_type override;
+  [[nodiscard]] auto
+  json_release_directory_snapshot(const std::string &path,
+                                  const remote::file_handle &handle)
+      -> packet::error_type override;
 
   void set_fuse_uid_gid(const remote::user_id &uid,
                         const remote::group_id &gid) override;

repertory/librepertory/include/drives/winfsp/remotewinfsp/i_remote_instance.hpp

@@ -29,87 +29,92 @@ class i_remote_instance : public virtual i_remote_json {
   INTERFACE_SETUP(i_remote_instance);
 
 public:
-  virtual auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
+  [[nodiscard]] virtual auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_cleanup(PVOID file_desc, PWSTR file_name, UINT32 flags,
-                              BOOLEAN &was_deleted) -> packet::error_type = 0;
+  [[nodiscard]] virtual auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
+                                            UINT32 flags, BOOLEAN &was_deleted)
+      -> packet::error_type = 0;
 
-  virtual auto winfsp_close(PVOID file_desc) -> packet::error_type = 0;
+  [[nodiscard]] virtual auto winfsp_close(PVOID file_desc)
+      -> packet::error_type = 0;
 
-  virtual auto winfsp_create(PWSTR file_name, UINT32 create_options,
-                             UINT32 granted_access, UINT32 file_attributes,
-                             UINT64 allocation_size, PVOID *file_desc,
-                             remote::file_info *file_info,
+  [[nodiscard]] virtual auto
+  winfsp_create(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
+                UINT32 file_attributes, UINT64 allocation_size,
+                PVOID *file_desc, remote::file_info *file_info,
                 std::string &normalized_name, BOOLEAN &exists)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
-      -> packet::error_type = 0;
-
-  virtual auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
-      -> packet::error_type = 0;
-
-  virtual auto winfsp_get_file_info(PVOID file_desc,
+  [[nodiscard]] virtual auto winfsp_flush(PVOID file_desc,
                                           remote::file_info *file_info)
       -> packet::error_type = 0;
 
-  virtual auto
+  [[nodiscard]] virtual auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
+      -> packet::error_type = 0;
+
+  [[nodiscard]] virtual auto winfsp_get_file_info(PVOID file_desc,
+                                                  remote::file_info *file_info)
+      -> packet::error_type = 0;
+
+  [[nodiscard]] virtual auto
   winfsp_get_security_by_name(PWSTR file_name, PUINT32 file_attributes,
                               std::uint64_t *security_descriptor_size,
                               std::wstring &str_descriptor)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_get_volume_info(UINT64 &total_size, UINT64 &free_size,
+  [[nodiscard]] virtual auto winfsp_get_volume_info(UINT64 &total_size,
+                                                    UINT64 &free_size,
                                                     std::string &volume_label)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_mounted(const std::wstring &location)
+  [[nodiscard]] virtual auto winfsp_mounted(const std::wstring &location)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_open(PWSTR file_name, UINT32 create_options,
-                           UINT32 granted_access, PVOID *file_desc,
-                           remote::file_info *file_info,
-                           std::string &normalized_name)
+  [[nodiscard]] virtual auto
+  winfsp_open(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
+              PVOID *file_desc, remote::file_info *file_info,
+              std::string &normalized_name) -> packet::error_type = 0;
+
+  [[nodiscard]] virtual auto
+  winfsp_overwrite(PVOID file_desc, UINT32 file_attributes,
+                   BOOLEAN replace_file_attributes, UINT64 allocation_size,
+                   remote::file_info *file_info) -> packet::error_type = 0;
+
+  [[nodiscard]] virtual auto winfsp_read(PVOID file_desc, PVOID buffer,
+                                         UINT64 offset, UINT32 length,
+                                         PUINT32 bytes_transferred)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_overwrite(PVOID file_desc, UINT32 file_attributes,
-                                BOOLEAN replace_file_attributes,
-                                UINT64 allocation_size,
-                                remote::file_info *file_info)
+  [[nodiscard]] virtual auto winfsp_read_directory(PVOID file_desc,
+                                                   PWSTR pattern, PWSTR marker,
+                                                   json &itemList)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset,
-                           UINT32 length, PUINT32 bytes_transferred)
+  [[nodiscard]] virtual auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+                                           PWSTR new_file_name,
+                                           BOOLEAN replace_if_exists)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_read_directory(PVOID file_desc, PWSTR pattern,
-                                     PWSTR marker, json &itemList)
-      -> packet::error_type = 0;
-
-  virtual auto winfsp_rename(PVOID file_desc, PWSTR file_name,
-                             PWSTR new_file_name, BOOLEAN replace_if_exists)
-      -> packet::error_type = 0;
-
-  virtual auto winfsp_set_basic_info(PVOID file_desc, UINT32 file_attributes,
-                                     UINT64 creation_time,
-                                     UINT64 last_access_time,
+  [[nodiscard]] virtual auto
+  winfsp_set_basic_info(PVOID file_desc, UINT32 file_attributes,
+                        UINT64 creation_time, UINT64 last_access_time,
                         UINT64 last_write_time, UINT64 change_time,
-                                     remote::file_info *file_info)
-      -> packet::error_type = 0;
+                        remote::file_info *file_info) -> packet::error_type = 0;
 
-  virtual auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
+  [[nodiscard]] virtual auto winfsp_set_file_size(PVOID file_desc,
+                                                  UINT64 new_size,
                                                   BOOLEAN set_allocation_size,
                                                   remote::file_info *file_info)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_unmounted(const std::wstring &location)
+  [[nodiscard]] virtual auto winfsp_unmounted(const std::wstring &location)
       -> packet::error_type = 0;
 
-  virtual auto winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset,
-                            UINT32 length, BOOLEAN write_to_end,
-                            BOOLEAN constrained_io, PUINT32 bytes_transferred,
-                            remote::file_info *file_info)
+  [[nodiscard]] virtual auto
+  winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
+               BOOLEAN write_to_end, BOOLEAN constrained_io,
+               PUINT32 bytes_transferred, remote::file_info *file_info)
       -> packet::error_type = 0;
 };
 

repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp

@@ -44,91 +44,103 @@ private:
 #if defined(_WIN32)
 #define to_handle(x) (x)
 #else  // !defined(_WIN32)
-  static auto to_handle(PVOID file_desc) -> native_handle;
+  [[nodiscard]] static auto to_handle(PVOID file_desc) -> native_handle;
 #endif // defined(_WIN32)
 
 public:
-  auto json_create_directory_snapshot(const std::string &path, json &json_data)
+  [[nodiscard]] auto check() -> packet::error_type;
+
+  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
+                                                    json &json_data)
       -> packet::error_type override;
 
-  auto json_read_directory_snapshot(const std::string &path,
-                                    const remote::file_handle &handle,
-                                    std::uint32_t page, json &json_data)
-      -> packet::error_type override;
+  [[nodiscard]] auto json_read_directory_snapshot(
+      const std::string &path, const remote::file_handle &handle,
+      std::uint32_t page, json &json_data) -> packet::error_type override;
 
-  auto json_release_directory_snapshot(const std::string &path,
+  [[nodiscard]] auto
+  json_release_directory_snapshot(const std::string &path,
                                   const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
+  [[nodiscard]] auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
       -> packet::error_type override;
 
-  auto winfsp_cleanup(PVOID file_desc, PWSTR file_name, UINT32 flags,
-                      BOOLEAN &was_deleted) -> packet::error_type override;
+  [[nodiscard]] auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
+                                    UINT32 flags, BOOLEAN &was_deleted)
+      -> packet::error_type override;
 
-  auto winfsp_close(PVOID file_desc) -> packet::error_type override;
+  [[nodiscard]] auto winfsp_close(PVOID file_desc)
+      -> packet::error_type override;
 
-  auto winfsp_create(PWSTR file_name, UINT32 create_options,
-                     UINT32 granted_access, UINT32 attributes,
-                     UINT64 allocation_size, PVOID *file_desc,
+  [[nodiscard]] auto
+  winfsp_create(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
+                UINT32 attributes, UINT64 allocation_size, PVOID *file_desc,
                 remote::file_info *file_info, std::string &normalized_name,
                 BOOLEAN &exists) -> packet::error_type override;
 
-  auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
+  [[nodiscard]] auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
+  [[nodiscard]] auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
       -> packet::error_type override;
 
-  auto winfsp_get_file_info(PVOID file_desc, remote::file_info *file_info)
+  [[nodiscard]] auto winfsp_get_file_info(PVOID file_desc,
+                                          remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_get_security_by_name(PWSTR file_name, PUINT32 attributes,
-                                   std::uint64_t *descriptor_size,
-                                   std::wstring &string_descriptor)
-      -> packet::error_type override;
+  [[nodiscard]] auto winfsp_get_security_by_name(
+      PWSTR file_name, PUINT32 attributes, std::uint64_t *descriptor_size,
+      std::wstring &string_descriptor) -> packet::error_type override;
 
-  auto winfsp_get_volume_info(UINT64 &total_size, UINT64 &free_size,
+  [[nodiscard]] auto winfsp_get_volume_info(UINT64 &total_size,
+                                            UINT64 &free_size,
                                             std::string &volume_label)
       -> packet::error_type override;
 
-  auto winfsp_mounted(const std::wstring &location)
+  [[nodiscard]] auto winfsp_mounted(const std::wstring &location)
       -> packet::error_type override;
 
-  auto winfsp_open(PWSTR file_name, UINT32 create_options,
+  [[nodiscard]] auto winfsp_open(PWSTR file_name, UINT32 create_options,
                                  UINT32 granted_access, PVOID *file_desc,
-                   remote::file_info *file_info, std::string &normalized_name)
+                                 remote::file_info *file_info,
+                                 std::string &normalized_name)
       -> packet::error_type override;
 
-  auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
-                        BOOLEAN replace_attributes, UINT64 allocation_size,
+  [[nodiscard]] auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
+                                      BOOLEAN replace_attributes,
+                                      UINT64 allocation_size,
                                       remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-                   PUINT32 bytes_transferred) -> packet::error_type override;
-
-  auto winfsp_read_directory(PVOID file_desc, PWSTR pattern, PWSTR marker,
-                             json &itemList) -> packet::error_type override;
-
-  auto winfsp_rename(PVOID file_desc, PWSTR file_name, PWSTR new_file_name,
-                     BOOLEAN replace_if_exists) -> packet::error_type override;
-
-  auto winfsp_set_basic_info(PVOID file_desc, UINT32 attributes,
-                             UINT64 creation_time, UINT64 last_access_time,
-                             UINT64 last_write_time, UINT64 change_time,
-                             remote::file_info *file_info)
+  [[nodiscard]] auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset,
+                                 UINT32 length, PUINT32 bytes_transferred)
       -> packet::error_type override;
 
-  auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
+  [[nodiscard]] auto winfsp_read_directory(PVOID file_desc, PWSTR pattern,
+                                           PWSTR marker, json &itemList)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+                                   PWSTR new_file_name,
+                                   BOOLEAN replace_if_exists)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto winfsp_set_basic_info(
+      PVOID file_desc, UINT32 attributes, UINT64 creation_time,
+      UINT64 last_access_time, UINT64 last_write_time, UINT64 change_time,
+      remote::file_info *file_info) -> packet::error_type override;
+
+  [[nodiscard]] auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
                                           BOOLEAN set_allocation_size,
                                           remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_unmounted(const std::wstring &location)
+  [[nodiscard]] auto winfsp_unmounted(const std::wstring &location)
       -> packet::error_type override;
 
-  auto winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
+  [[nodiscard]] auto
+  winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
                BOOLEAN write_to_end, BOOLEAN constrained_io,
                PUINT32 bytes_transferred, remote::file_info *file_info)
       -> packet::error_type override;

repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_server.hpp

@@ -58,41 +58,46 @@ private:
 
 public:
   // FUSE Layer
-  auto fuse_access(const char *path, const std::int32_t &mask)
+  [[nodiscard]] auto fuse_access(const char *path, const std::int32_t &mask)
       -> packet::error_type override;
 
-  auto fuse_chflags(const char *path, std::uint32_t flags)
+  [[nodiscard]] auto fuse_chflags(const char *path, std::uint32_t flags)
       -> packet::error_type override;
 
-  auto fuse_chmod(const char *path, const remote::file_mode &mode)
+  [[nodiscard]] auto fuse_chmod(const char *path, const remote::file_mode &mode)
       -> packet::error_type override;
 
-  auto fuse_chown(const char *path, const remote::user_id &uid,
-                  const remote::group_id &gid) -> packet::error_type override;
+  [[nodiscard]] auto fuse_chown(const char *path, const remote::user_id &uid,
+                                const remote::group_id &gid)
+      -> packet::error_type override;
 
-  auto fuse_destroy() -> packet::error_type override;
+  [[nodiscard]] auto fuse_destroy() -> packet::error_type override;
 
   /*packet::error_type fuse_fallocate(const char *path, const std::int32_t
      &mode, const remote::file_offset &offset, const remote::file_offset
      &length, const remote::file_handle &handle) override ;*/
 
-  auto fuse_fgetattr(const char *path, remote::stat &r_stat, bool &directory,
+  [[nodiscard]] auto fuse_fgetattr(const char *path, remote::stat &r_stat,
+                                   bool &directory,
                                    const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_fsetattr_x(const char *path, const remote::setattr_x &attr,
+  [[nodiscard]] auto fuse_fsetattr_x(const char *path,
+                                     const remote::setattr_x &attr,
                                      const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_fsync(const char *path, const std::int32_t &datasync,
+  [[nodiscard]] auto fuse_fsync(const char *path, const std::int32_t &datasync,
                                 const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_ftruncate(const char *path, const remote::file_offset &size,
+  [[nodiscard]] auto fuse_ftruncate(const char *path,
+                                    const remote::file_offset &size,
                                     const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_getattr(const char *path, remote::stat &r_stat, bool &directory)
+  [[nodiscard]] auto fuse_getattr(const char *path, remote::stat &r_stat,
+                                  bool &directory)
       -> packet::error_type override;
 
   /*packet::error_type fuse_getxattr(const char *path, const char *name, char
@@ -101,77 +106,90 @@ public:
   packet::error_type fuse_getxattrOSX(const char *path, const char *name, char
   *value, const remote::file_size &size, std::uint32_t position) override ;*/
 
-  auto fuse_getxtimes(const char *path, remote::file_time &bkuptime,
-                      remote::file_time &crtime) -> packet::error_type override;
+  [[nodiscard]] auto fuse_getxtimes(const char *path,
+                                    remote::file_time &bkuptime,
+                                    remote::file_time &crtime)
+      -> packet::error_type override;
 
-  auto fuse_init() -> packet::error_type override;
+  [[nodiscard]] auto fuse_init() -> packet::error_type override;
 
   /*packet::error_type fuse_listxattr(const char *path, char *buffer,
                                          const remote::file_size &size) override
      ;*/
 
-  auto fuse_mkdir(const char *path, const remote::file_mode &mode)
+  [[nodiscard]] auto fuse_mkdir(const char *path, const remote::file_mode &mode)
       -> packet::error_type override;
 
-  auto fuse_opendir(const char *path, remote::file_handle &handle)
+  [[nodiscard]] auto fuse_opendir(const char *path, remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_create(const char *path, const remote::file_mode &mode,
+  [[nodiscard]] auto
+  fuse_create(const char *path, const remote::file_mode &mode,
               const remote::open_flags &flags, remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_open(const char *path, const remote::open_flags &flags,
-                 remote::file_handle &handle) -> packet::error_type override;
+  [[nodiscard]] auto fuse_open(const char *path,
+                               const remote::open_flags &flags,
+                               remote::file_handle &handle)
+      -> packet::error_type override;
 
-  auto fuse_read(const char *path, char *buffer,
+  [[nodiscard]] auto fuse_read(const char *path, char *buffer,
                                const remote::file_size &read_size,
                                const remote::file_offset &read_offset,
                                const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_rename(const char *from, const char *to)
+  [[nodiscard]] auto fuse_rename(const char *from, const char *to)
       -> packet::error_type override;
 
-  auto fuse_write(const char *path, const char *buffer,
+  [[nodiscard]] auto fuse_write(const char *path, const char *buffer,
                                 const remote::file_size &write_size,
                                 const remote::file_offset &write_offset,
                                 const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_write_base64(const char *path, const char *buffer,
+  [[nodiscard]] auto fuse_write_base64(const char *path, const char *buffer,
                                        const remote::file_size &write_size,
                                        const remote::file_offset &write_offset,
                                        const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_readdir(const char *path, const remote::file_offset &offset,
+  [[nodiscard]] auto
+  fuse_readdir(const char *path, const remote::file_offset &offset,
                const remote::file_handle &handle, std::string &item_path)
       -> packet::error_type override;
 
-  auto fuse_release(const char *path, const remote::file_handle &handle)
+  [[nodiscard]] auto fuse_release(const char *path,
+                                  const remote::file_handle &handle)
       -> packet::error_type override;
 
-  auto fuse_releasedir(const char *path, const remote::file_handle &handle)
+  [[nodiscard]] auto fuse_releasedir(const char *path,
+                                     const remote::file_handle &handle)
       -> packet::error_type override;
 
   /*packet::error_type fuse_removexattr(const char *path, const char *name)
    * override ;*/
 
-  auto fuse_rmdir(const char *path) -> packet::error_type override;
-
-  auto fuse_setattr_x(const char *path, remote::setattr_x &attr)
+  [[nodiscard]] auto fuse_rmdir(const char *path)
       -> packet::error_type override;
 
-  auto fuse_setbkuptime(const char *path, const remote::file_time &bkuptime)
+  [[nodiscard]] auto fuse_setattr_x(const char *path, remote::setattr_x &attr)
       -> packet::error_type override;
 
-  auto fuse_setchgtime(const char *path, const remote::file_time &chgtime)
+  [[nodiscard]] auto fuse_setbkuptime(const char *path,
+                                      const remote::file_time &bkuptime)
       -> packet::error_type override;
 
-  auto fuse_setcrtime(const char *path, const remote::file_time &crtime)
+  [[nodiscard]] auto fuse_setchgtime(const char *path,
+                                     const remote::file_time &chgtime)
       -> packet::error_type override;
 
-  auto fuse_setvolname(const char *volname) -> packet::error_type override;
+  [[nodiscard]] auto fuse_setcrtime(const char *path,
+                                    const remote::file_time &crtime)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto fuse_setvolname(const char *volname)
+      -> packet::error_type override;
 
   /*packet::error_type fuse_setxattr(const char *path, const char *name, const
   char *value, const remote::file_size &size, const std::int32_t &flags)
@@ -181,18 +199,22 @@ public:
   char *value, const remote::file_size &size, const std::int32_t &flags,
                                            std::uint32_t position) override ;*/
 
-  auto fuse_statfs(const char *path, std::uint64_t frsize,
-                   remote::statfs &r_stat) -> packet::error_type override;
-
-  auto fuse_statfs_x(const char *path, std::uint64_t bsize,
-                     remote::statfs_x &r_stat) -> packet::error_type override;
-
-  auto fuse_truncate(const char *path, const remote::file_offset &size)
+  [[nodiscard]] auto fuse_statfs(const char *path, std::uint64_t frsize,
+                                 remote::statfs &r_stat)
       -> packet::error_type override;
 
-  auto fuse_unlink(const char *path) -> packet::error_type override;
+  [[nodiscard]] auto fuse_statfs_x(const char *path, std::uint64_t bsize,
+                                   remote::statfs_x &r_stat)
+      -> packet::error_type override;
 
-  auto fuse_utimens(const char *path, const remote::file_time *tv,
+  [[nodiscard]] auto fuse_truncate(const char *path,
+                                   const remote::file_offset &size)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto fuse_unlink(const char *path)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto fuse_utimens(const char *path, const remote::file_time *tv,
                                   std::uint64_t op0, std::uint64_t op1)
       -> packet::error_type override;
 
@@ -200,88 +222,98 @@ public:
                         const remote::group_id & /* gid */) override {}
 
   // JSON Layer
-  auto json_create_directory_snapshot(const std::string &path, json &json_data)
+  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
+                                                    json &json_data)
       -> packet::error_type override;
 
-  auto json_read_directory_snapshot(const std::string &path,
-                                    const remote::file_handle &handle,
-                                    std::uint32_t page, json &json_data)
-      -> packet::error_type override;
+  [[nodiscard]] auto json_read_directory_snapshot(
+      const std::string &path, const remote::file_handle &handle,
+      std::uint32_t page, json &json_data) -> packet::error_type override;
 
-  auto json_release_directory_snapshot(const std::string &path,
+  [[nodiscard]] auto
+  json_release_directory_snapshot(const std::string &path,
                                   const remote::file_handle &handle)
       -> packet::error_type override;
 
   // WinFSP Layer
-  auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
+  [[nodiscard]] auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
       -> packet::error_type override;
 
-  auto winfsp_cleanup(PVOID file_desc, PWSTR file_name, UINT32 flags,
-                      BOOLEAN &was_deleted) -> packet::error_type override;
+  [[nodiscard]] auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
+                                    UINT32 flags, BOOLEAN &was_deleted)
+      -> packet::error_type override;
 
-  auto winfsp_close(PVOID file_desc) -> packet::error_type override;
+  [[nodiscard]] auto winfsp_close(PVOID file_desc)
+      -> packet::error_type override;
 
-  auto winfsp_create(PWSTR file_name, UINT32 create_options,
-                     UINT32 granted_access, UINT32 attributes,
-                     UINT64 allocation_size, PVOID *file_desc,
+  [[nodiscard]] auto
+  winfsp_create(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
+                UINT32 attributes, UINT64 allocation_size, PVOID *file_desc,
                 remote::file_info *file_info, std::string &normalized_name,
                 BOOLEAN &exists) -> packet::error_type override;
 
-  auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
+  [[nodiscard]] auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
+  [[nodiscard]] auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
       -> packet::error_type override;
 
-  auto winfsp_get_file_info(PVOID file_desc, remote::file_info *file_info)
+  [[nodiscard]] auto winfsp_get_file_info(PVOID file_desc,
+                                          remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_get_security_by_name(PWSTR file_name, PUINT32 attributes,
-                                   std::uint64_t *descriptor_size,
-                                   std::wstring &string_descriptor)
-      -> packet::error_type override;
+  [[nodiscard]] auto winfsp_get_security_by_name(
+      PWSTR file_name, PUINT32 attributes, std::uint64_t *descriptor_size,
+      std::wstring &string_descriptor) -> packet::error_type override;
 
-  auto winfsp_get_volume_info(UINT64 &total_size, UINT64 &free_size,
+  [[nodiscard]] auto winfsp_get_volume_info(UINT64 &total_size,
+                                            UINT64 &free_size,
                                             std::string &volume_label)
       -> packet::error_type override;
 
-  auto winfsp_mounted(const std::wstring &location)
+  [[nodiscard]] auto winfsp_mounted(const std::wstring &location)
       -> packet::error_type override;
 
-  auto winfsp_open(PWSTR file_name, UINT32 create_options,
+  [[nodiscard]] auto winfsp_open(PWSTR file_name, UINT32 create_options,
                                  UINT32 granted_access, PVOID *file_desc,
-                   remote::file_info *file_info, std::string &normalized_name)
+                                 remote::file_info *file_info,
+                                 std::string &normalized_name)
       -> packet::error_type override;
 
-  auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
-                        BOOLEAN replace_attributes, UINT64 allocation_size,
+  [[nodiscard]] auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
+                                      BOOLEAN replace_attributes,
+                                      UINT64 allocation_size,
                                       remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-                   PUINT32 bytes_transferred) -> packet::error_type override;
-
-  auto winfsp_read_directory(PVOID file_desc, PWSTR pattern, PWSTR marker,
-                             json &item_list) -> packet::error_type override;
-
-  auto winfsp_rename(PVOID file_desc, PWSTR file_name, PWSTR new_file_name,
-                     BOOLEAN replace_if_exists) -> packet::error_type override;
-
-  auto winfsp_set_basic_info(PVOID file_desc, UINT32 attributes,
-                             UINT64 creation_time, UINT64 last_access_time,
-                             UINT64 last_write_time, UINT64 change_time,
-                             remote::file_info *file_info)
+  [[nodiscard]] auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset,
+                                 UINT32 length, PUINT32 bytes_transferred)
       -> packet::error_type override;
 
-  auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
+  [[nodiscard]] auto winfsp_read_directory(PVOID file_desc, PWSTR pattern,
+                                           PWSTR marker, json &item_list)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+                                   PWSTR new_file_name,
+                                   BOOLEAN replace_if_exists)
+      -> packet::error_type override;
+
+  [[nodiscard]] auto winfsp_set_basic_info(
+      PVOID file_desc, UINT32 attributes, UINT64 creation_time,
+      UINT64 last_access_time, UINT64 last_write_time, UINT64 change_time,
+      remote::file_info *file_info) -> packet::error_type override;
+
+  [[nodiscard]] auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
                                           BOOLEAN set_allocation_size,
                                           remote::file_info *file_info)
       -> packet::error_type override;
 
-  auto winfsp_unmounted(const std::wstring &location)
+  [[nodiscard]] auto winfsp_unmounted(const std::wstring &location)
       -> packet::error_type override;
 
-  auto winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
+  [[nodiscard]] auto
+  winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
                BOOLEAN write_to_end, BOOLEAN constrained_io,
                PUINT32 bytes_transferred, remote::file_info *file_info)
       -> packet::error_type override;

repertory/librepertory/include/events/consumers/logging_consumer.hpp

@@ -35,9 +35,8 @@ public:
   ~logging_consumer();
 
 private:
-  static constexpr const std::uint8_t MAX_LOG_FILES{5U};
-  static constexpr const std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL *
-                                                         5ULL};
+  static constexpr std::uint8_t MAX_LOG_FILES{5U};
+  static constexpr std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL * 5ULL};
 
 private:
   static void process_event(const i_event &evt);

repertory/librepertory/include/events/event_system.hpp

@@ -27,7 +27,7 @@ class i_event;
 
 class event_system final {
 private:
-  static constexpr const std::uint8_t max_queue_retry{
+  static constexpr std::uint8_t max_queue_retry{
       30U,
   };
 
@@ -35,7 +35,7 @@ private:
       std::thread::hardware_concurrency() * 4U,
   };
 
-  static constexpr const std::chrono::seconds queue_wait_secs{
+  static constexpr std::chrono::seconds queue_wait_secs{
       5s,
   };
 

repertory/librepertory/include/events/types/curl_error.hpp

@@ -33,8 +33,8 @@ struct curl_error final : public i_event {
         function_name(std::string{function_name_}),
         url(std::move(url_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"curl_error"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"curl_error"};
 
   CURLcode code{};
   std::string function_name;

repertory/librepertory/include/events/types/debug_log.hpp

@@ -31,8 +31,8 @@ struct debug_log final : public i_event {
   debug_log(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"debug_log"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"debug_log"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/directory_remove_failed.hpp

@@ -34,8 +34,8 @@ struct directory_remove_failed final : public i_event {
         error(error_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"directory_remove_failed"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"directory_remove_failed"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/directory_removed.hpp

@@ -32,8 +32,8 @@ struct directory_removed final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"directory_removed"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"directory_removed"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/directory_removed_externally.hpp

@@ -35,8 +35,8 @@ struct directory_removed_externally final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"directory_removed_externally"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"directory_removed_externally"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/download_begin.hpp

@@ -34,8 +34,8 @@ struct download_begin final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"download_begin"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"download_begin"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_end.hpp

@@ -35,8 +35,8 @@ struct download_end final : public i_event {
         error(error_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"download_end"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"download_end"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_progress.hpp

@@ -35,8 +35,8 @@ struct download_progress final : public i_event {
         function_name(std::string(function_name_)),
         progress(progress_) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"download_progress"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"download_progress"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_restore_failed.hpp

@@ -35,8 +35,8 @@ struct download_restore_failed final : public i_event {
         error(std::move(error_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"download_restore_failed"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"download_restore_failed"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_restored.hpp

@@ -34,8 +34,8 @@ struct download_restored final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"download_restored"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"download_restored"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_resume_add_failed.hpp

@@ -36,8 +36,8 @@ struct download_resume_add_failed final : public i_event {
         error(std::move(error_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"download_resume_add_failed"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"download_resume_add_failed"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_resume_added.hpp

@@ -34,8 +34,8 @@ struct download_resume_added final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"download_resume_added"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"download_resume_added"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_resume_removed.hpp

@@ -34,8 +34,8 @@ struct download_resume_removed final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"download_resume_removed"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"download_resume_removed"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_type_selected.hpp

@@ -35,8 +35,8 @@ struct download_type_selected final : public i_event {
         function_name(std::string(function_name_)),
         type(type_) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"download_type_selected"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"download_type_selected"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/drive_mount_failed.hpp

@@ -35,8 +35,8 @@ struct drive_mount_failed final : public i_event {
         function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"drive_mount_failed"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"drive_mount_failed"};
 
   NTSTATUS error{};
   std::string function_name;

repertory/librepertory/include/events/types/drive_mount_result.hpp

@@ -34,8 +34,8 @@ struct drive_mount_result final : public i_event {
         mount_location(std::move(mount_location_)),
         result(std::move(result_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"drive_mount_result"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"drive_mount_result"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/drive_mounted.hpp

@@ -32,8 +32,8 @@ struct drive_mounted final : public i_event {
       : function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"drive_mounted"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"drive_mounted"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/drive_stop_timed_out.hpp

@@ -31,8 +31,8 @@ struct drive_stop_timed_out final : public i_event {
   drive_stop_timed_out(std::string_view function_name_)
       : function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"drive_stop_timed_out"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"drive_stop_timed_out"};
 
   std::string function_name;
 

repertory/librepertory/include/events/types/drive_unmount_pending.hpp

@@ -33,8 +33,8 @@ struct drive_unmount_pending final : public i_event {
       : function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"drive_unmount_pending"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"drive_unmount_pending"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/drive_unmounted.hpp

@@ -32,8 +32,8 @@ struct drive_unmounted final : public i_event {
       : function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"drive_unmounted"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"drive_unmounted"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/event_level_changed.hpp

@@ -31,8 +31,8 @@ struct event_level_changed final : public i_event {
   event_level_changed(std::string_view function_name_, event_level new_level_)
       : function_name(std::string(function_name_)), new_level(new_level_) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"event_level_changed"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"event_level_changed"};
 
   std::string function_name;
   event_level new_level{};

repertory/librepertory/include/events/types/file_pinned.hpp

@@ -32,8 +32,8 @@ struct file_pinned final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"file_pinned"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"file_pinned"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_remove_failed.hpp

@@ -34,8 +34,8 @@ struct file_remove_failed final : public i_event {
         error(error_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"file_remove_failed"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"file_remove_failed"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/file_removed.hpp

@@ -32,8 +32,8 @@ struct file_removed final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"file_removed"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"file_removed"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_removed_externally.hpp

@@ -35,8 +35,8 @@ struct file_removed_externally final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"file_removed_externally"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"file_removed_externally"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_unpinned.hpp

@@ -32,8 +32,8 @@ struct file_unpinned final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"file_unpinned"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"file_unpinned"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_completed.hpp

@@ -37,8 +37,8 @@ struct file_upload_completed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"file_upload_completed"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"file_upload_completed"};
 
   std::string api_path;
   bool cancelled{};

repertory/librepertory/include/events/types/file_upload_failed.hpp

@@ -35,8 +35,8 @@ struct file_upload_failed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"file_upload_failed"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"file_upload_failed"};
 
   std::string api_path;
   std::string error;

repertory/librepertory/include/events/types/file_upload_not_found.hpp

@@ -34,8 +34,8 @@ struct file_upload_not_found final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"file_upload_not_found"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"file_upload_not_found"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_queued.hpp

@@ -34,8 +34,8 @@ struct file_upload_queued final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"file_upload_queued"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"file_upload_queued"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_removed.hpp

@@ -32,8 +32,8 @@ struct file_upload_removed final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"file_upload_removed"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"file_upload_removed"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_retry.hpp

@@ -35,8 +35,8 @@ struct file_upload_retry final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"file_upload_retry"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"file_upload_retry"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/filesystem_item_added.hpp

@@ -35,8 +35,8 @@ struct filesystem_item_added final : public i_event {
         directory(directory_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"filesystem_item_added"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"filesystem_item_added"};
 
   std::string api_parent;
   std::string api_path;

repertory/librepertory/include/events/types/filesystem_item_closed.hpp

@@ -37,8 +37,8 @@ struct filesystem_item_closed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::trace};
-  static constexpr const std::string_view name{"filesystem_item_closed"};
+  static constexpr event_level level{event_level::trace};
+  static constexpr std::string_view name{"filesystem_item_closed"};
 
   std::string api_path;
   bool changed{};

repertory/librepertory/include/events/types/filesystem_item_evicted.hpp

@@ -35,8 +35,8 @@ struct filesystem_item_evicted final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"filesystem_item_evicted"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"filesystem_item_evicted"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/filesystem_item_handle_closed.hpp

@@ -39,8 +39,8 @@ struct filesystem_item_handle_closed final : public i_event {
         handle(handle_),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::trace};
-  static constexpr const std::string_view name{"filesystem_item_handle_closed"};
+  static constexpr event_level level{event_level::trace};
+  static constexpr std::string_view name{"filesystem_item_handle_closed"};
 
   std::string api_path;
   bool changed{};

repertory/librepertory/include/events/types/filesystem_item_handle_opened.hpp

@@ -37,8 +37,8 @@ struct filesystem_item_handle_opened final : public i_event {
         handle(handle_),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::trace};
-  static constexpr const std::string_view name{"filesystem_item_handle_opened"};
+  static constexpr event_level level{event_level::trace};
+  static constexpr std::string_view name{"filesystem_item_handle_opened"};
 
   std::string api_path;
   bool directory{};

repertory/librepertory/include/events/types/filesystem_item_opened.hpp

@@ -36,8 +36,8 @@ struct filesystem_item_opened final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::trace};
-  static constexpr const std::string_view name{"filesystem_item_opened"};
+  static constexpr event_level level{event_level::trace};
+  static constexpr std::string_view name{"filesystem_item_opened"};
 
   std::string api_path;
   bool directory{};

repertory/librepertory/include/events/types/fuse_args_parsed.hpp

@@ -32,8 +32,8 @@ struct fuse_args_parsed final : public i_event {
   fuse_args_parsed(std::string_view args_, std::string_view function_name_)
       : args(std::move(args_)), function_name(std::string{function_name_}) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"fuse_args_parsed"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"fuse_args_parsed"};
 
   std::string args;
   std::string function_name;

repertory/librepertory/include/events/types/fuse_event.hpp

@@ -35,8 +35,8 @@ struct fuse_event final : public i_event {
         error(error_),
         function_name(std::string{function_name_}) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"fuse_event"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"fuse_event"};
 
   std::string api_path;
   std::int32_t error{};

repertory/librepertory/include/events/types/info_log.hpp

@@ -31,8 +31,8 @@ struct info_log final : public i_event {
   info_log(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"info_log"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"info_log"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/invalid_cache_size.hpp

@@ -34,8 +34,8 @@ struct invalid_cache_size final : public i_event {
         function_name(std::string{function_name_}),
         invalid_size(invalid_size_) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"invalid_cache_size"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"invalid_cache_size"};
 
   std::uint64_t cache_size{};
   std::string function_name;

repertory/librepertory/include/events/types/item_timeout.hpp

@@ -32,8 +32,8 @@ struct item_timeout final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::trace};
-  static constexpr const std::string_view name{"item_timeout"};
+  static constexpr event_level level{event_level::trace};
+  static constexpr std::string_view name{"item_timeout"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/max_cache_size_reached.hpp

@@ -35,8 +35,8 @@ struct max_cache_size_reached final : public i_event {
         function_name(std::string{function_name_}),
         max_cache_size(max_cache_size_) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"max_cache_size_reached"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"max_cache_size_reached"};
 
   std::uint64_t cache_size{};
   std::string function_name;

repertory/librepertory/include/events/types/orphaned_file_detected.hpp

@@ -33,8 +33,8 @@ struct orphaned_file_detected final : public i_event {
       : function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"orphaned_file_detected"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"orphaned_file_detected"};
 
   std::string function_name;
   std::string source_path;

repertory/librepertory/include/events/types/orphaned_file_processing_failed.hpp

@@ -36,8 +36,8 @@ struct orphaned_file_processing_failed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{
       "orphaned_file_processing_failed",
   };
 

repertory/librepertory/include/events/types/orphaned_source_file_detected.hpp

@@ -33,8 +33,8 @@ struct orphaned_source_file_detected final : public i_event {
       : function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"orphaned_source_file_detected"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"orphaned_source_file_detected"};
 
   std::string function_name;
   std::string source_path;

repertory/librepertory/include/events/types/orphaned_source_file_removed.hpp

@@ -33,8 +33,8 @@ struct orphaned_source_file_removed final : public i_event {
       : function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"orphaned_source_file_removed"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"orphaned_source_file_removed"};
 
   std::string function_name;
   std::string source_path;

repertory/librepertory/include/events/types/packet_client_timeout.hpp

@@ -34,8 +34,8 @@ struct packet_client_timeout final : public i_event {
         function_name(std::string(function_name_)),
         msg(std::move(msg_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"packet_client_timeout"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"packet_client_timeout"};
 
   std::string event_name;
   std::string function_name;

repertory/librepertory/include/events/types/polling_item_begin.hpp

@@ -32,8 +32,8 @@ struct polling_item_begin final : public i_event {
       : function_name(std::string(function_name_)),
         item_name(std::move(item_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"polling_item_begin"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"polling_item_begin"};
 
   std::string function_name;
   std::string item_name;

repertory/librepertory/include/events/types/polling_item_end.hpp

@@ -32,8 +32,8 @@ struct polling_item_end final : public i_event {
       : function_name(std::string(function_name_)),
         item_name(std::move(item_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"polling_item_end"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"polling_item_end"};
 
   std::string function_name;
   std::string item_name;

repertory/librepertory/include/events/types/provider_invalid_version.hpp

@@ -35,8 +35,8 @@ struct provider_invalid_version final : public i_event {
         required_version(std::move(required_version_)),
         returned_version(std::move(returned_version_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"provider_invalid_version"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"provider_invalid_version"};
 
   std::string function_name;
   std::string required_version;

repertory/librepertory/include/events/types/provider_offline.hpp

@@ -34,8 +34,8 @@ struct provider_offline final : public i_event {
         host_name_or_ip(std::move(host_name_or_ip_)),
         port(port_) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"provider_offline"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"provider_offline"};
 
   std::string function_name;
   std::string host_name_or_ip;

repertory/librepertory/include/events/types/provider_upload_begin.hpp

@@ -34,8 +34,8 @@ struct provider_upload_begin final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"provider_upload_begin"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"provider_upload_begin"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/provider_upload_end.hpp

@@ -35,8 +35,8 @@ struct provider_upload_end final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"provider_upload_end"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"provider_upload_end"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/remote_server_event.hpp

@@ -35,8 +35,8 @@ struct remote_server_event final : public i_event {
         error(error_),
         function_name(std::string{function_name_}) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"remote_server_event"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"remote_server_event"};
 
   std::string api_path;
   packet::error_type error{};

repertory/librepertory/include/events/types/repertory_exception.hpp

@@ -31,8 +31,8 @@ struct repertory_exception final : public i_event {
   repertory_exception(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr const event_level level{event_level::error};
-  static constexpr const std::string_view name{"repertory_exception"};
+  static constexpr event_level level{event_level::error};
+  static constexpr std::string_view name{"repertory_exception"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/service_start_begin.hpp

@@ -33,8 +33,8 @@ struct service_start_begin final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"service_start_begin"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"service_start_begin"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/service_start_end.hpp

@@ -32,8 +32,8 @@ struct service_start_end final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"service_start_end"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"service_start_end"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/service_stop_begin.hpp

@@ -32,8 +32,8 @@ struct service_stop_begin final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"service_stop_begin"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"service_stop_begin"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/service_stop_end.hpp

@@ -32,8 +32,8 @@ struct service_stop_end final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"service_stop_end"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"service_stop_end"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/trace_log.hpp

@@ -31,8 +31,8 @@ struct trace_log final : public i_event {
   trace_log(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr const event_level level{event_level::trace};
-  static constexpr const std::string_view name{"trace_log"};
+  static constexpr event_level level{event_level::trace};
+  static constexpr std::string_view name{"trace_log"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/unmount_requested.hpp

@@ -31,8 +31,8 @@ struct unmount_requested final : public i_event {
   unmount_requested(std::string_view function_name_)
       : function_name(std::string(function_name_)) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"unmount_requested"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"unmount_requested"};
 
   std::string function_name;
 

repertory/librepertory/include/events/types/unmount_result.hpp

@@ -35,8 +35,8 @@ struct unmount_result final : public i_event {
         mount_location(std::move(mount_location_)),
         result(result_) {}
 
-  static constexpr const event_level level{event_level::info};
-  static constexpr const std::string_view name{"unmount_result"};
+  static constexpr event_level level{event_level::info};
+  static constexpr std::string_view name{"unmount_result"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/warn_log.hpp

@@ -31,8 +31,8 @@ struct warn_log final : public i_event {
   warn_log(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr const event_level level{event_level::warn};
-  static constexpr const std::string_view name{"warn_log"};
+  static constexpr event_level level{event_level::warn};
+  static constexpr std::string_view name{"warn_log"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/winfsp_event.hpp

@@ -35,8 +35,8 @@ struct winfsp_event final : public i_event {
         error(error_),
         function_name(std::string{function_name_}) {}
 
-  static constexpr const event_level level{event_level::debug};
-  static constexpr const std::string_view name{"winfsp_event"};
+  static constexpr event_level level{event_level::debug};
+  static constexpr std::string_view name{"winfsp_event"};
 
   std::string api_path;
   NTSTATUS error{};

repertory/librepertory/include/file_manager/cache_size_mgr.hpp

@@ -29,7 +29,7 @@ class app_config;
 
 class cache_size_mgr final {
 private:
-  static constexpr const std::chrono::seconds cache_wait_secs{
+  static constexpr std::chrono::seconds cache_wait_secs{
       5s,
   };
 

repertory/librepertory/include/file_manager/file_manager.hpp

@@ -40,7 +40,7 @@ class file_manager final : public i_file_manager, public i_upload_manager {
   E_CONSUMER();
 
 private:
-  static constexpr const std::chrono::seconds queue_wait_secs{
+  static constexpr std::chrono::seconds queue_wait_secs{
       5s,
   };
 

repertory/librepertory/include/file_manager/ring_buffer_base.hpp

@@ -48,7 +48,7 @@ public:
       -> ring_buffer_base & = delete;
 
 public:
-  static constexpr const auto min_ring_size{5U};
+  static constexpr auto min_ring_size{5U};
 
 private:
   boost::dynamic_bitset<> read_state_;

repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp

@@ -84,6 +84,8 @@ private:
 
   void remove_deleted_files(stop_type &stop_requested);
 
+  void remove_expired_files();
+
 public:
   [[nodiscard]] auto check_version(std::string &required_version,
                                    std::string &returned_version) const

repertory/librepertory/include/rpc/server/server.hpp

@@ -30,8 +30,13 @@ class app_config;
 class server {
 public:
   explicit server(app_config &config);
+  server(const server &) = delete;
+  server(server &&) = delete;
 
-  virtual ~server() { stop(); }
+  auto operator=(const server &) -> server & = delete;
+  auto operator=(server &&) -> server & = delete;
+
+  virtual ~server();
 
 private:
   app_config &config_;

repertory/librepertory/include/types/remote.hpp

@@ -24,19 +24,20 @@
 
 #include "types/repertory.hpp"
 
-inline constexpr const auto PACKET_SERVICE_FUSE{1U};
-inline constexpr const auto PACKET_SERVICE_WINFSP{2U};
+inline constexpr auto PACKET_SERVICE_FUSE{1U};
+inline constexpr auto PACKET_SERVICE_WINFSP{2U};
 
 #if defined(_WIN32)
-inline constexpr const auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_WINFSP};
+inline constexpr auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_WINFSP};
 #else  // !defined(_WIN32)
-inline constexpr const auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_FUSE};
+inline constexpr auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_FUSE};
 #endif // defined(_WIN32)
 
-constexpr const auto default_remote_client_pool_size{20U};
-constexpr const auto default_remote_max_connections{20U};
-constexpr const auto default_remote_receive_timeout_ms{120U * 1000U};
-constexpr const auto default_remote_send_timeout_ms{30U * 1000U};
+inline constexpr auto default_remote_directory_page_size{std::size_t(100U)};
+inline constexpr auto default_remote_client_pool_size{20U};
+inline constexpr auto default_remote_max_connections{20U};
+inline constexpr auto default_remote_receive_timeout_ms{120U * 1000U};
+inline constexpr auto default_remote_send_timeout_ms{30U * 1000U};
 
 namespace repertory::remote {
 struct remote_config final {
@@ -217,8 +218,8 @@ struct statfs_x final : public statfs {
 #if !defined(_WIN32)
 [[nodiscard]] auto create_open_flags(std::uint32_t flags) -> open_flags;
 
-[[nodiscard]] auto
-create_os_open_flags(const open_flags &flags) -> std::uint32_t;
+[[nodiscard]] auto create_os_open_flags(const open_flags &flags)
+    -> std::uint32_t;
 #endif // !defined(_WIN32)
 } // namespace repertory::remote
 

repertory/librepertory/include/types/repertory.hpp

@@ -23,32 +23,36 @@
 #define REPERTORY_INCLUDE_TYPES_REPERTORY_HPP_
 
 namespace repertory {
-constexpr const auto default_api_password_size{48U};
-constexpr const auto default_download_timeout_secs{30U};
-constexpr const auto default_eviction_delay_mins{1U};
-constexpr const auto default_high_freq_interval_secs{std::uint16_t{30U}};
-constexpr const auto default_low_freq_interval_secs{std::uint16_t(60U * 60U)};
-constexpr const auto default_max_cache_size_bytes{
+inline constexpr auto default_api_password_size{48U};
+inline constexpr auto default_download_timeout_secs{30U};
+inline constexpr auto default_eviction_delay_mins{1U};
+inline constexpr auto default_high_freq_interval_secs{std::uint16_t{30U}};
+inline constexpr auto default_low_freq_interval_secs{
+    std::uint16_t(60U * 60U),
+};
+inline constexpr auto default_max_cache_size_bytes{
     std::uint64_t(20ULL * 1024ULL * 1024ULL * 1024ULL),
 };
-constexpr const auto default_max_upload_count{5U};
-constexpr const auto default_med_freq_interval_secs{std::uint16_t{2U * 60U}};
-constexpr const auto default_online_check_retry_secs{60U};
-constexpr const auto default_retry_read_count{6U};
-constexpr const auto default_ring_buffer_file_size{512U};
-constexpr const auto default_task_wait_ms{100U};
-constexpr const auto default_timeout_ms{60000U};
-constexpr const auto default_ui_mgmt_port{std::uint16_t{30000U}};
-constexpr const auto max_ring_buffer_file_size{std::uint16_t(1024U)};
-constexpr const auto max_s3_object_name_length{1024U};
-constexpr const auto min_cache_size_bytes{
+inline constexpr auto default_max_upload_count{5U};
+inline constexpr auto default_med_freq_interval_secs{
+    std::uint16_t{2U * 60U},
+};
+inline constexpr auto default_online_check_retry_secs{60U};
+inline constexpr auto default_retry_read_count{6U};
+inline constexpr auto default_ring_buffer_file_size{512U};
+inline constexpr auto default_task_wait_ms{100U};
+inline constexpr auto default_timeout_ms{60000U};
+inline constexpr auto default_ui_mgmt_port{std::uint16_t{30000U}};
+inline constexpr auto max_ring_buffer_file_size{std::uint16_t(1024U)};
+inline constexpr auto max_s3_object_name_length{1024U};
+inline constexpr auto min_cache_size_bytes{
     std::uint64_t(100ULL * 1024ULL * 1024ULL),
 };
-constexpr const auto min_download_timeout_secs{std::uint8_t(5U)};
-constexpr const auto min_online_check_retry_secs{std::uint16_t(15U)};
-constexpr const auto min_retry_read_count{std::uint16_t(2U)};
-constexpr const auto min_ring_buffer_file_size{std::uint16_t(64U)};
-constexpr const auto min_task_wait_ms{std::uint16_t(50U)};
+inline constexpr auto min_download_timeout_secs{std::uint8_t(5U)};
+inline constexpr auto min_online_check_retry_secs{std::uint16_t(15U)};
+inline constexpr auto min_retry_read_count{std::uint16_t(2U)};
+inline constexpr auto min_ring_buffer_file_size{std::uint16_t(64U)};
+inline constexpr auto min_task_wait_ms{std::uint16_t(50U)};
 
 template <typename data_t> class atomic final {
 public:
@@ -139,28 +143,28 @@ public:
   [[nodiscard]] operator data_t() const { return load(); }
 };
 
-inline constexpr const auto max_time{
+inline constexpr auto max_time{
     std::numeric_limits<std::uint64_t>::max(),
 };
 
-inline constexpr const std::string META_ACCESSED{"accessed"};
-inline constexpr const std::string META_ATTRIBUTES{"attributes"};
-inline constexpr const std::string META_BACKUP{"backup"};
-inline constexpr const std::string META_CHANGED{"changed"};
-inline constexpr const std::string META_CREATION{"creation"};
-inline constexpr const std::string META_DIRECTORY{"directory"};
-inline constexpr const std::string META_GID{"gid"};
-inline constexpr const std::string META_KEY{"key"};
-inline constexpr const std::string META_MODE{"mode"};
-inline constexpr const std::string META_MODIFIED{"modified"};
-inline constexpr const std::string META_OSXFLAGS{"flags"};
-inline constexpr const std::string META_PINNED{"pinned"};
-inline constexpr const std::string META_SIZE{"size"};
-inline constexpr const std::string META_SOURCE{"source"};
-inline constexpr const std::string META_UID{"uid"};
-inline constexpr const std::string META_WRITTEN{"written"};
+inline constexpr std::string META_ACCESSED{"accessed"};
+inline constexpr std::string META_ATTRIBUTES{"attributes"};
+inline constexpr std::string META_BACKUP{"backup"};
+inline constexpr std::string META_CHANGED{"changed"};
+inline constexpr std::string META_CREATION{"creation"};
+inline constexpr std::string META_DIRECTORY{"directory"};
+inline constexpr std::string META_GID{"gid"};
+inline constexpr std::string META_KEY{"key"};
+inline constexpr std::string META_MODE{"mode"};
+inline constexpr std::string META_MODIFIED{"modified"};
+inline constexpr std::string META_OSXFLAGS{"flags"};
+inline constexpr std::string META_PINNED{"pinned"};
+inline constexpr std::string META_SIZE{"size"};
+inline constexpr std::string META_SOURCE{"source"};
+inline constexpr std::string META_UID{"uid"};
+inline constexpr std::string META_WRITTEN{"written"};
 
-inline constexpr const std::array<std::string, 16U> META_USED_NAMES = {
+inline constexpr std::array<std::string, 16U> META_USED_NAMES = {
     META_ACCESSED, META_ATTRIBUTES, META_BACKUP,   META_CHANGED,
     META_CREATION, META_DIRECTORY,  META_GID,      META_KEY,
     META_MODE,     META_MODIFIED,   META_OSXFLAGS, META_PINNED,
@@ -283,11 +287,13 @@ enum class exit_code : std::int32_t {
   init_failed = -18,
   ui_mount_failed = -19,
   exception = -20,
+  provider_offline = -21
 };
 
 enum http_error_codes : std::int32_t {
   ok = 200,
   multiple_choices = 300,
+  bad_request = 400,
   unauthorized = 401,
   not_found = 404,
   internal_error = 500,
@@ -465,66 +471,58 @@ using api_item_added_callback = std::function<api_error(bool, api_file &)>;
 using directory_item_list = std::vector<directory_item>;
 using meta_provider_callback = std::function<void(directory_item &)>;
 
-inline constexpr const auto JSON_ACCESS_KEY{"AccessKey"};
-inline constexpr const auto JSON_AGENT_STRING{"AgentString"};
-inline constexpr const auto JSON_API_PARENT{"ApiParent"};
-inline constexpr const auto JSON_API_PASSWORD{"ApiPassword"};
-inline constexpr const auto JSON_API_PATH{"ApiPath"};
-inline constexpr const auto JSON_API_PORT{"ApiPort"};
-inline constexpr const auto JSON_API_USER{"ApiUser"};
-inline constexpr const auto JSON_BUCKET{"Bucket"};
-inline constexpr const auto JSON_CLIENT_POOL_SIZE{"ClientPoolSize"};
-inline constexpr const auto JSON_DATABASE_TYPE{"DatabaseType"};
-inline constexpr const auto JSON_DIRECTORY{"Directory"};
-inline constexpr const auto JSON_DOWNLOAD_TIMEOUT_SECS{
-    "DownloadTimeoutSeconds"};
-inline constexpr const auto JSON_ENABLE_DRIVE_EVENTS{"EnableDriveEvents"};
-inline constexpr const auto JSON_ENABLE_DOWNLOAD_TIMEOUT{
-    "EnableDownloadTimeout"};
-inline constexpr const auto JSON_ENABLE_MOUNT_MANAGER{"EnableMountManager"};
-inline constexpr const auto JSON_ENABLE_REMOTE_MOUNT{"Enable"};
-inline constexpr const auto JSON_ENCRYPTION_TOKEN{"EncryptionToken"};
-inline constexpr const auto JSON_ENCRYPT_CONFIG{"EncryptConfig"};
-inline constexpr const auto JSON_EVENT_LEVEL{"EventLevel"};
-inline constexpr const auto JSON_EVICTION_DELAY_MINS{"EvictionDelayMinutes"};
-inline constexpr const auto JSON_EVICTION_USE_ACCESS_TIME{
-    "EvictionUseAccessedTime"};
-inline constexpr const auto JSON_HIGH_FREQ_INTERVAL_SECS{
-    "HighFreqIntervalSeconds"};
-inline constexpr const auto JSON_HOST_CONFIG{"HostConfig"};
-inline constexpr const auto JSON_HOST_NAME_OR_IP{"HostNameOrIp"};
-inline constexpr const auto JSON_LOW_FREQ_INTERVAL_SECS{
-    "LowFreqIntervalSeconds"};
-inline constexpr const auto JSON_MAX_CACHE_SIZE_BYTES{"MaxCacheSizeBytes"};
-inline constexpr const auto JSON_MAX_CONNECTIONS{"MaxConnections"};
-inline constexpr const auto JSON_MAX_UPLOAD_COUNT{"MaxUploadCount"};
-inline constexpr const auto JSON_MED_FREQ_INTERVAL_SECS{
-    "MedFreqIntervalSeconds"};
-inline constexpr const auto JSON_META{"Meta"};
-inline constexpr const auto JSON_MOUNT_LOCATIONS{"MountLocations"};
-inline constexpr const auto JSON_ONLINE_CHECK_RETRY_SECS{
-    "OnlineCheckRetrySeconds"};
-inline constexpr const auto JSON_PATH{"Path"};
-inline constexpr const auto JSON_PREFERRED_DOWNLOAD_TYPE{
-    "PreferredDownloadType"};
-inline constexpr const auto JSON_PROTOCOL{"Protocol"};
-inline constexpr const auto JSON_RECV_TIMEOUT_MS{"ReceiveTimeoutMs"};
-inline constexpr const auto JSON_REGION{"Region"};
-inline constexpr const auto JSON_REMOTE_CONFIG{"RemoteConfig"};
-inline constexpr const auto JSON_REMOTE_MOUNT{"RemoteMount"};
-inline constexpr const auto JSON_RETRY_READ_COUNT{"RetryReadCount"};
-inline constexpr const auto JSON_RING_BUFFER_FILE_SIZE{"RingBufferFileSize"};
-inline constexpr const auto JSON_S3_CONFIG{"S3Config"};
-inline constexpr const auto JSON_SECRET_KEY{"SecretKey"};
-inline constexpr const auto JSON_SEND_TIMEOUT_MS{"SendTimeoutMs"};
-inline constexpr const auto JSON_SIA_CONFIG{"SiaConfig"};
-inline constexpr const auto JSON_SIZE{"Size"};
-inline constexpr const auto JSON_TASK_WAIT_MS{"TaskWaitMs"};
-inline constexpr const auto JSON_TIMEOUT_MS{"TimeoutMs"};
-inline constexpr const auto JSON_URL{"URL"};
-inline constexpr const auto JSON_USE_PATH_STYLE{"UsePathStyle"};
-inline constexpr const auto JSON_USE_REGION_IN_URL{"UseRegionInURL"};
-inline constexpr const auto JSON_VERSION{"Version"};
+inline constexpr auto JSON_ACCESS_KEY{"AccessKey"};
+inline constexpr auto JSON_AGENT_STRING{"AgentString"};
+inline constexpr auto JSON_API_PARENT{"ApiParent"};
+inline constexpr auto JSON_API_PASSWORD{"ApiPassword"};
+inline constexpr auto JSON_API_PATH{"ApiPath"};
+inline constexpr auto JSON_API_PORT{"ApiPort"};
+inline constexpr auto JSON_API_USER{"ApiUser"};
+inline constexpr auto JSON_BUCKET{"Bucket"};
+inline constexpr auto JSON_CLIENT_POOL_SIZE{"ClientPoolSize"};
+inline constexpr auto JSON_DATABASE_TYPE{"DatabaseType"};
+inline constexpr auto JSON_DIRECTORY{"Directory"};
+inline constexpr auto JSON_DOWNLOAD_TIMEOUT_SECS{"DownloadTimeoutSeconds"};
+inline constexpr auto JSON_ENABLE_DRIVE_EVENTS{"EnableDriveEvents"};
+inline constexpr auto JSON_ENABLE_DOWNLOAD_TIMEOUT{"EnableDownloadTimeout"};
+inline constexpr auto JSON_ENABLE_MOUNT_MANAGER{"EnableMountManager"};
+inline constexpr auto JSON_ENABLE_REMOTE_MOUNT{"Enable"};
+inline constexpr auto JSON_ENCRYPTION_TOKEN{"EncryptionToken"};
+inline constexpr auto JSON_ENCRYPT_CONFIG{"EncryptConfig"};
+inline constexpr auto JSON_EVENT_LEVEL{"EventLevel"};
+inline constexpr auto JSON_EVICTION_DELAY_MINS{"EvictionDelayMinutes"};
+inline constexpr auto JSON_EVICTION_USE_ACCESS_TIME{"EvictionUseAccessedTime"};
+inline constexpr auto JSON_HIGH_FREQ_INTERVAL_SECS{"HighFreqIntervalSeconds"};
+inline constexpr auto JSON_HOST_CONFIG{"HostConfig"};
+inline constexpr auto JSON_HOST_NAME_OR_IP{"HostNameOrIp"};
+inline constexpr auto JSON_LOW_FREQ_INTERVAL_SECS{"LowFreqIntervalSeconds"};
+inline constexpr auto JSON_MAX_CACHE_SIZE_BYTES{"MaxCacheSizeBytes"};
+inline constexpr auto JSON_MAX_CONNECTIONS{"MaxConnections"};
+inline constexpr auto JSON_MAX_UPLOAD_COUNT{"MaxUploadCount"};
+inline constexpr auto JSON_MED_FREQ_INTERVAL_SECS{"MedFreqIntervalSeconds"};
+inline constexpr auto JSON_META{"Meta"};
+inline constexpr auto JSON_MOUNT_LOCATIONS{"MountLocations"};
+inline constexpr auto JSON_ONLINE_CHECK_RETRY_SECS{"OnlineCheckRetrySeconds"};
+inline constexpr auto JSON_PATH{"Path"};
+inline constexpr auto JSON_PREFERRED_DOWNLOAD_TYPE{"PreferredDownloadType"};
+inline constexpr auto JSON_PROTOCOL{"Protocol"};
+inline constexpr auto JSON_RECV_TIMEOUT_MS{"ReceiveTimeoutMs"};
+inline constexpr auto JSON_REGION{"Region"};
+inline constexpr auto JSON_REMOTE_CONFIG{"RemoteConfig"};
+inline constexpr auto JSON_REMOTE_MOUNT{"RemoteMount"};
+inline constexpr auto JSON_RETRY_READ_COUNT{"RetryReadCount"};
+inline constexpr auto JSON_RING_BUFFER_FILE_SIZE{"RingBufferFileSize"};
+inline constexpr auto JSON_S3_CONFIG{"S3Config"};
+inline constexpr auto JSON_SECRET_KEY{"SecretKey"};
+inline constexpr auto JSON_SEND_TIMEOUT_MS{"SendTimeoutMs"};
+inline constexpr auto JSON_SIA_CONFIG{"SiaConfig"};
+inline constexpr auto JSON_SIZE{"Size"};
+inline constexpr auto JSON_TASK_WAIT_MS{"TaskWaitMs"};
+inline constexpr auto JSON_TIMEOUT_MS{"TimeoutMs"};
+inline constexpr auto JSON_URL{"URL"};
+inline constexpr auto JSON_USE_PATH_STYLE{"UsePathStyle"};
+inline constexpr auto JSON_USE_REGION_IN_URL{"UseRegionInURL"};
+inline constexpr auto JSON_VERSION{"Version"};
 } // namespace repertory
 
 NLOHMANN_JSON_NAMESPACE_BEGIN

repertory/librepertory/include/types/s3.hpp

@@ -50,10 +50,10 @@ using list_objects_result = std::vector<directory_item>;
 
 struct head_object_result {
   std::uint64_t content_length{};
-  std::string content_type{};
-  std::uint64_t last_modified{};
+  std::string content_type;
+  std::uint64_t last_modified;
 
-  inline auto from_headers(http_headers headers) -> head_object_result & {
+  auto from_headers(http_headers headers) -> head_object_result & {
     content_length = utils::string::to_uint64(headers["content-length"]);
     content_type = headers["content-type"];
     auto date = headers["last-modified"];

repertory/librepertory/include/utils/cli_utils.hpp

@@ -28,35 +28,36 @@ namespace repertory::utils::cli {
 using option = std::array<std::string, 2>;
 
 namespace options {
-static const option check_version_option = {"-cv", "--check_version"};
-static const option display_config_option = {"-dc", "--display_config"};
-static const option data_directory_option = {"-dd", "--data_directory"};
-static const option encrypt_option = {"-en", "--encrypt"};
-static const option drive_information_option = {"-di", "--drive_information"};
-static const option name_option = {"-na", "--name"};
-static const option s3_option = {"-s3", "--s3"};
-static const option generate_config_option = {"-gc", "--generate_config"};
-static const option get_option = {"-get", "--get"};
-static const option get_directory_items_option = {"-gdi",
+inline const option check_version_option = {"-cv", "--check_version"};
+inline const option display_config_option = {"-dc", "--display_config"};
+inline const option data_directory_option = {"-dd", "--data_directory"};
+inline const option encrypt_option = {"-en", "--encrypt"};
+inline const option drive_information_option = {"-di", "--drive_information"};
+inline const option name_option = {"-na", "--name"};
+inline const option s3_option = {"-s3", "--s3"};
+inline const option generate_config_option = {"-gc", "--generate_config"};
+inline const option get_option = {"-get", "--get"};
+inline const option get_directory_items_option = {"-gdi",
                                                   "--get_directory_items"};
-static const option get_pinned_files_option = {"-gpf", "--get_pinned_files"};
-static const option help_option = {"-h", "--help"};
-static const option hidden_option = {"-hidden", "--hidden"};
-static const option open_files_option = {"-of", "--open_files"};
-static const option pin_file_option = {"-pf", "--pin_file"};
-static const option pinned_status_option = {"-ps", "--pinned_status"};
-static const option password_option = {"-pw", "--password"};
-static const option remote_mount_option = {"-rm", "--remote_mount"};
-static const option set_option = {"-set", "--set"};
-static const option status_option = {"-status", "--status"};
-static const option ui_option = {"-ui", "--ui"};
-static const option ui_port_option = {"-up", "--ui_port"};
-static const option unmount_option = {"-unmount", "--unmount"};
-static const option unpin_file_option = {"-uf", "--unpin_file"};
-static const option user_option = {"-us", "--user"};
-static const option version_option = {"-V", "--version"};
+inline const option get_pinned_files_option = {"-gpf", "--get_pinned_files"};
+inline const option help_option = {"-h", "--help"};
+inline const option hidden_option = {"-hidden", "--hidden"};
+inline const option open_files_option = {"-of", "--open_files"};
+inline const option pin_file_option = {"-pf", "--pin_file"};
+inline const option pinned_status_option = {"-ps", "--pinned_status"};
+inline const option password_option = {"-pw", "--password"};
+inline const option remote_mount_option = {"-rm", "--remote_mount"};
+inline const option set_option = {"-set", "--set"};
+inline const option status_option = {"-status", "--status"};
+inline const option test_option = {"-test", "--test"};
+inline const option ui_option = {"-ui", "--ui"};
+inline const option ui_port_option = {"-up", "--ui_port"};
+inline const option unmount_option = {"-unmount", "--unmount"};
+inline const option unpin_file_option = {"-uf", "--unpin_file"};
+inline const option user_option = {"-us", "--user"};
+inline const option version_option = {"-V", "--version"};
 
-static const std::vector<option> option_list = {
+inline const std::vector<option> option_list = {
     check_version_option,
     display_config_option,
     data_directory_option,
@@ -77,6 +78,7 @@ static const std::vector<option> option_list = {
     remote_mount_option,
     set_option,
     status_option,
+    test_option,
     ui_option,
     ui_port_option,
     unmount_option,

repertory/librepertory/src/comm/curl/curl_comm.cpp

@@ -62,8 +62,8 @@ curl_comm::curl_comm(s3_config cfg)
 
 auto curl_comm::construct_url(CURL *curl, const std::string &relative_path,
                               const host_config &cfg) -> std::string {
-  static constexpr const auto http = 80U;
-  static constexpr const auto https = 443U;
+  static constexpr auto http{80U};
+  static constexpr auto https{443U};
 
   auto custom_port = (((cfg.protocol == "http") &&
                        (cfg.api_port == http || cfg.api_port == 0U)) ||
@@ -102,8 +102,7 @@ auto curl_comm::reset_curl(CURL *curl_handle) -> CURL * {
   return curl_handle;
 }
 
-auto curl_comm::create_host_config(const s3_config &cfg, bool use_s3_path_style)
-    -> host_config {
+auto curl_comm::create_host_config(const s3_config &cfg) -> host_config {
   host_config host_cfg{};
   host_cfg.api_password = cfg.secret_key;
   host_cfg.api_user = cfg.access_key;
@@ -118,28 +117,23 @@ auto curl_comm::create_host_config(const s3_config &cfg, bool use_s3_path_style)
     }
   }
 
-  if (not use_s3_path_style) {
+  if (not cfg.use_path_style) {
     host_cfg.host_name_or_ip = cfg.bucket + '.' + host_cfg.host_name_or_ip;
   }
 
   host_cfg.protocol = cfg.url.substr(0U, pos);
-  if (use_s3_path_style) {
+  if (cfg.use_path_style) {
     host_cfg.path = '/' + cfg.bucket;
   }
 
   return host_cfg;
 }
 
-void curl_comm::enable_s3_path_style(bool enable) {
-  use_s3_path_style_ = enable;
-}
-
 auto curl_comm::make_request(const curl::requests::http_delete &del,
                              long &response_code,
                              stop_type &stop_requested) const -> bool {
-  return make_request(
-      s3_config_.has_value()
-          ? create_host_config(s3_config_.value(), use_s3_path_style_)
+  return make_request(s3_config_.has_value()
+                          ? create_host_config(s3_config_.value())
                           : host_config_.value_or(host_config{}),
                       del, response_code, stop_requested);
 }
@@ -147,9 +141,8 @@ auto curl_comm::make_request(const curl::requests::http_delete &del,
 auto curl_comm::make_request(const curl::requests::http_get &get,
                              long &response_code,
                              stop_type &stop_requested) const -> bool {
-  return make_request(
-      s3_config_.has_value()
-          ? create_host_config(s3_config_.value(), use_s3_path_style_)
+  return make_request(s3_config_.has_value()
+                          ? create_host_config(s3_config_.value())
                           : host_config_.value_or(host_config{}),
                       get, response_code, stop_requested);
 }
@@ -157,9 +150,8 @@ auto curl_comm::make_request(const curl::requests::http_get &get,
 auto curl_comm::make_request(const curl::requests::http_head &head,
                              long &response_code,
                              stop_type &stop_requested) const -> bool {
-  return make_request(
-      s3_config_.has_value()
-          ? create_host_config(s3_config_.value(), use_s3_path_style_)
+  return make_request(s3_config_.has_value()
+                          ? create_host_config(s3_config_.value())
                           : host_config_.value_or(host_config{}),
                       head, response_code, stop_requested);
 }
@@ -167,9 +159,8 @@ auto curl_comm::make_request(const curl::requests::http_head &head,
 auto curl_comm::make_request(const curl::requests::http_post &post,
                              long &response_code,
                              stop_type &stop_requested) const -> bool {
-  return make_request(
-      s3_config_.has_value()
-          ? create_host_config(s3_config_.value(), use_s3_path_style_)
+  return make_request(s3_config_.has_value()
+                          ? create_host_config(s3_config_.value())
                           : host_config_.value_or(host_config{}),
                       post, response_code, stop_requested);
 }
@@ -177,9 +168,8 @@ auto curl_comm::make_request(const curl::requests::http_post &post,
 auto curl_comm::make_request(const curl::requests::http_put_file &put_file,
                              long &response_code,
                              stop_type &stop_requested) const -> bool {
-  return make_request(
-      s3_config_.has_value()
-          ? create_host_config(s3_config_.value(), use_s3_path_style_)
+  return make_request(s3_config_.has_value()
+                          ? create_host_config(s3_config_.value())
                           : host_config_.value_or(host_config{}),
                       put_file, response_code, stop_requested);
 }

repertory/librepertory/src/comm/curl/multi_request.cpp

@@ -39,7 +39,7 @@ multi_request::~multi_request() {
 }
 
 void multi_request::get_result(CURLcode &curl_code, long &http_code) {
-  static constexpr const auto timeout_ms = 100;
+  static constexpr auto timeout_ms{100};
 
   curl_code = CURLcode::CURLE_ABORTED_BY_CALLBACK;
   http_code = -1;

repertory/librepertory/src/comm/packet/packet_client.cpp

@@ -173,7 +173,7 @@ auto packet_client::send(std::string_view method, packet &request,
   request.encode_top(PACKET_SERVICE_FLAGS);
   request.encode_top(std::string{project_get_version()});
 
-  static constexpr const std::uint8_t max_attempts{5U};
+  static constexpr std::uint8_t max_attempts{5U};
   for (std::uint8_t i = 1U;
        allow_connections_ && not success && (i <= max_attempts); i++) {
     auto current_client = get_client();

repertory/librepertory/src/drives/fuse/fuse_base.cpp

@@ -64,7 +64,7 @@ fuse_base::fuse_base(app_config &config) : config_(config) {
   fuse_ops_.truncate = fuse_base::truncate_;
 #if !defined(__APPLE__)
   fuse_ops_.statfs = fuse_base::statfs_;
-#endif // __APPLE__
+#endif // !defined(__APPLE__)
   fuse_ops_.unlink = fuse_base::unlink_;
   fuse_ops_.utimens = fuse_base::utimens_;
   fuse_ops_.write = fuse_base::write_;
@@ -117,7 +117,7 @@ auto fuse_base::chflags_(const char *path, uint32_t flags) -> int {
         return instance().chflags_impl(std::move(api_path), flags);
       });
 }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
 auto fuse_base::chmod_(const char *path, mode_t mode, struct fuse_file_info *fi)
@@ -129,7 +129,7 @@ auto fuse_base::chmod_(const char *path, mode_t mode, struct fuse_file_info *fi)
         return instance().chmod_impl(std::move(api_path), mode, fi);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::chmod_(const char *path, mode_t mode) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -138,7 +138,7 @@ auto fuse_base::chmod_(const char *path, mode_t mode) -> int {
         return instance().chmod_impl(std::move(api_path), mode);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if FUSE_USE_VERSION >= 30
 auto fuse_base::chown_(const char *path, uid_t uid, gid_t gid,
@@ -150,7 +150,7 @@ auto fuse_base::chown_(const char *path, uid_t uid, gid_t gid,
         return instance().chown_impl(std::move(api_path), uid, gid, fi);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::chown_(const char *path, uid_t uid, gid_t gid) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -159,7 +159,7 @@ auto fuse_base::chown_(const char *path, uid_t uid, gid_t gid) -> int {
         return instance().chown_impl(std::move(api_path), uid, gid);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 auto fuse_base::create_(const char *path, mode_t mode,
                         struct fuse_file_info *fi) -> int {
@@ -187,12 +187,12 @@ void fuse_base::display_options(
     [[maybe_unused]] std::vector<const char *> args) {
 #if FUSE_USE_VERSION >= 30
   fuse_cmdline_help();
-#else
+#else  // FUSE_USE_VERSION < 30
   struct fuse_operations fuse_ops{};
   fuse_main(args.size(),
             reinterpret_cast<char **>(const_cast<char **>(args.data())),
             &fuse_ops, nullptr);
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
   std::cout << std::endl;
 }
@@ -266,7 +266,7 @@ auto fuse_base::fgetattr_(const char *path, struct stat *st,
         return instance().fgetattr_impl(std::move(api_path), st, fi);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION < 30
 
 #if defined(__APPLE__)
 auto fuse_base::fsetattr_x_(const char *path, struct setattr_x *attr,
@@ -278,7 +278,7 @@ auto fuse_base::fsetattr_x_(const char *path, struct setattr_x *attr,
         return instance().fsetattr_x_impl(std::move(api_path), attr, fi);
       });
 }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 auto fuse_base::fsync_(const char *path, int datasync,
                        struct fuse_file_info *fi) -> int {
@@ -300,7 +300,7 @@ auto fuse_base::ftruncate_(const char *path, off_t size,
         return instance().ftruncate_impl(std::move(api_path), size, fi);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION < 30
 
 #if FUSE_USE_VERSION >= 30
 auto fuse_base::getattr_(const char *path, struct stat *st,
@@ -312,7 +312,7 @@ auto fuse_base::getattr_(const char *path, struct stat *st,
         return instance().getattr_impl(std::move(api_path), st, fi);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::getattr_(const char *path, struct stat *st) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -321,7 +321,7 @@ auto fuse_base::getattr_(const char *path, struct stat *st) -> int {
         return instance().getattr_impl(std::move(api_path), st);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if defined(__APPLE__)
 auto fuse_base::getxtimes_(const char *path, struct timespec *bkuptime,
@@ -333,7 +333,7 @@ auto fuse_base::getxtimes_(const char *path, struct timespec *bkuptime,
         return instance().getxtimes_impl(std::move(api_path), bkuptime, crtime);
       });
 }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
 auto fuse_base::init_(struct fuse_conn_info *conn, struct fuse_config *cfg)
@@ -344,14 +344,14 @@ auto fuse_base::init_(struct fuse_conn_info *conn, struct fuse_config *cfg)
     return instance().init_impl(conn, cfg);
   });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::init_(struct fuse_conn_info *conn) -> void * {
   REPERTORY_USES_FUNCTION_NAME();
 
   return execute_void_pointer_callback(
       function_name, [&]() -> void * { return instance().init_impl(conn); });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 #if FUSE_USE_VERSION >= 30
 auto fuse_base::init_impl([[maybe_unused]] struct fuse_conn_info *conn,
@@ -413,9 +413,9 @@ auto fuse_base::mount(std::vector<std::string> args) -> int {
       struct fuse_cmdline_opts opts{};
       fuse_parse_cmdline(&fa, &opts);
       mount_location = opts.mountpoint;
-#else
+#else  // FUSE_USE_VERSION < 30
       fuse_parse_cmdline(&fa, &mount_location, nullptr, nullptr);
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
       if (mount_location) {
         mount_location_ = mount_location;
@@ -427,7 +427,7 @@ auto fuse_base::mount(std::vector<std::string> args) -> int {
 
 #if FUSE_USE_VERSION < 30
     umask(0);
-#endif
+#endif // FUSE_USE_VERSION < 30
 
     if (not console_enabled_) {
       repertory::project_cleanup();
@@ -489,7 +489,7 @@ auto fuse_base::readdir_(const char *path, void *buf,
                                        offset, fi, flags);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::readdir_(const char *path, void *buf,
                          fuse_fill_dir_t fuse_fill_dir, off_t offset,
                          struct fuse_file_info *fi) -> int {
@@ -501,7 +501,7 @@ auto fuse_base::readdir_(const char *path, void *buf,
                                        offset, fi);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 auto fuse_base::release_(const char *path, struct fuse_file_info *fi) -> int {
   REPERTORY_USES_FUNCTION_NAME();
@@ -534,7 +534,7 @@ auto fuse_base::rename_(const char *from, const char *to, unsigned int flags)
                                       std::move(to_api_path), flags);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::rename_(const char *from, const char *to) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -545,7 +545,7 @@ auto fuse_base::rename_(const char *from, const char *to) -> int {
                                       std::move(to_api_path));
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 auto fuse_base::rmdir_(const char *path) -> int {
   REPERTORY_USES_FUNCTION_NAME();
@@ -571,7 +571,7 @@ auto fuse_base::getxattr_(const char *path, const char *name, char *value,
 
   return res == 0 ? attribute_size : res;
 }
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
 auto fuse_base::getxattr_(const char *path, const char *name, char *value,
                           size_t size) -> int {
   REPERTORY_USES_FUNCTION_NAME();
@@ -585,7 +585,7 @@ auto fuse_base::getxattr_(const char *path, const char *name, char *value,
 
   return res == 0 ? attribute_size : res;
 }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 auto fuse_base::listxattr_(const char *path, char *buffer, size_t size) -> int {
   REPERTORY_USES_FUNCTION_NAME();
@@ -737,7 +737,7 @@ auto fuse_base::setxattr_(const char *path, const char *name, const char *value,
 
   return res;
 }
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
 auto fuse_base::setxattr_(const char *path, const char *name, const char *value,
                           size_t size, int flags) -> int {
   REPERTORY_USES_FUNCTION_NAME();
@@ -753,8 +753,8 @@ auto fuse_base::setxattr_(const char *path, const char *name, const char *value,
 
   return res;
 }
-#endif // __APPLE__
-#endif // HAS_SETXATTR
+#endif // defined(__APPLE__)
+#endif // defined(HAS_SETXATTR)
 
 void fuse_base::shutdown() {
   REPERTORY_USES_FUNCTION_NAME();
@@ -821,7 +821,7 @@ auto fuse_base::statfs_x_(const char *path, struct statfs *stbuf) -> int {
         return instance().statfs_x_impl(std::move(api_path), stbuf);
       });
 }
-#else  // __APPLE__
+#else  // !defined(__APPLE__)
 auto fuse_base::statfs_(const char *path, struct statvfs *stbuf) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -830,7 +830,7 @@ auto fuse_base::statfs_(const char *path, struct statvfs *stbuf) -> int {
         return instance().statfs_impl(std::move(api_path), stbuf);
       });
 }
-#endif // __APPLE__
+#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
 auto fuse_base::truncate_(const char *path, off_t size,
@@ -842,7 +842,7 @@ auto fuse_base::truncate_(const char *path, off_t size,
         return instance().truncate_impl(std::move(api_path), size, fi);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::truncate_(const char *path, off_t size) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -851,7 +851,7 @@ auto fuse_base::truncate_(const char *path, off_t size) -> int {
         return instance().truncate_impl(std::move(api_path), size);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 auto fuse_base::unlink_(const char *path) -> int {
   REPERTORY_USES_FUNCTION_NAME();
@@ -865,13 +865,13 @@ auto fuse_base::unlink_(const char *path) -> int {
 auto fuse_base::unmount(const std::string &mount_location) -> int {
 #if defined(__APPLE__)
   const auto cmd = "umount \"" + mount_location + "\" >/dev/null 2>&1";
-#else
+#else // !defined(__APPLE__)
 #if FUSE_USE_VERSION >= 30
   const auto cmd = "fusermount3 -u \"" + mount_location + "\" >/dev/null 2>&1";
-#else
+#else  // FUSE_USE_VERSION < 30
   const auto cmd = "fusermount -u \"" + mount_location + "\" >/dev/null 2>&1";
-#endif
-#endif
+#endif // FUSE_USE_VERSION >= 30
+#endif // defined(__APPLE__)
 
   return system(cmd.c_str());
 }
@@ -886,7 +886,7 @@ auto fuse_base::utimens_(const char *path, const struct timespec tv[2],
         return instance().utimens_impl(std::move(api_path), tv, fi);
       });
 }
-#else
+#else  // FUSE_USE_VERSION < 30
 auto fuse_base::utimens_(const char *path, const struct timespec tv[2]) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -895,7 +895,7 @@ auto fuse_base::utimens_(const char *path, const struct timespec tv[2]) -> int {
         return instance().utimens_impl(std::move(api_path), tv);
       });
 }
-#endif
+#endif // FUSE_USE_VERSION >= 30
 
 auto fuse_base::write_(const char *path, const char *buffer, size_t write_size,
                        off_t write_offset, struct fuse_file_info *fi) -> int {
@@ -914,4 +914,4 @@ auto fuse_base::write_(const char *path, const char *buffer, size_t write_size,
 }
 } // namespace repertory
 
-#endif // _WIN32
+#endif // !defined(_WIN32)

repertory/librepertory/src/drives/fuse/fuse_drive.cpp

@@ -1445,4 +1445,4 @@ void fuse_drive::update_accessed_time(const std::string &api_path) {
 }
 } // namespace repertory
 
-#endif // _WIN32
+#endif // !defined(_WIN32)