diff --git a/repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp b/repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp
index 9f51fbbc..bdfe981a 100644
--- a/repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp
+++ b/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,
-                         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
+  [[nodiscard]] auto parse_xattr_parameters(const char *name,
+                                            const uint32_t &position,
+                                            std::string &attribute_name,
+                                            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,
-                         std::string &attribute_name,
-                         const std::string &api_path) -> api_error;
-#endif
+#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 // defined(__APPLE__)
 
   static void populate_stat(const std::string &api_path,
                             std::uint64_t size_or_count,
@@ -125,8 +131,8 @@ 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;