refactor

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

@@ -40,47 +40,37 @@ auto fuse_base::instance() -> fuse_base & {
 }
 
 fuse_base::fuse_base(app_config &config) : config_(config) {
-  fuse_ops_.getattr = fuse_base::getattr_;
-  fuse_ops_.mkdir = fuse_base::mkdir_;
-  fuse_ops_.unlink = fuse_base::unlink_;
-  fuse_ops_.rmdir = fuse_base::rmdir_;
-  fuse_ops_.rename = fuse_base::rename_;
+  fuse_ops_.access = fuse_base::access_;
   fuse_ops_.chmod = fuse_base::chmod_;
   fuse_ops_.chown = fuse_base::chown_;
-  fuse_ops_.truncate = fuse_base::truncate_;
+  fuse_ops_.create = fuse_base::create_;
+  fuse_ops_.destroy = fuse_base::destroy_;
+  fuse_ops_.fallocate = fuse_base::fallocate_;
+  fuse_ops_.fsync = fuse_base::fsync_;
+  fuse_ops_.getattr = fuse_base::getattr_;
+  fuse_ops_.init = fuse_base::init_;
+  fuse_ops_.mkdir = fuse_base::mkdir_;
   fuse_ops_.open = fuse_base::open_;
+  fuse_ops_.opendir = fuse_base::opendir_;
   fuse_ops_.read = fuse_base::read_;
-  fuse_ops_.write = fuse_base::write_;
+  fuse_ops_.readdir = fuse_base::readdir_;
+  fuse_ops_.release = fuse_base::release_;
+  fuse_ops_.releasedir = fuse_base::releasedir_;
+  fuse_ops_.rename = fuse_base::rename_;
+  fuse_ops_.rmdir = fuse_base::rmdir_;
+  fuse_ops_.truncate = fuse_base::truncate_;
 #if !defined(__APPLE__)
   fuse_ops_.statfs = fuse_base::statfs_;
 #endif // __APPLE__
-  fuse_ops_.release = fuse_base::release_;
-  fuse_ops_.fsync = fuse_base::fsync_;
+  fuse_ops_.unlink = fuse_base::unlink_;
+  fuse_ops_.utimens = fuse_base::utimens_;
+  fuse_ops_.write = fuse_base::write_;
 #if defined(HAS_SETXATTR)
-  fuse_ops_.setxattr = fuse_base::setxattr_;
   fuse_ops_.getxattr = fuse_base::getxattr_;
   fuse_ops_.listxattr = fuse_base::listxattr_;
   fuse_ops_.removexattr = fuse_base::removexattr_;
-#endif // HAS_SETXATTR
-  fuse_ops_.opendir = fuse_base::opendir_;
-  fuse_ops_.readdir = fuse_base::readdir_;
-  fuse_ops_.releasedir = fuse_base::releasedir_;
-  fuse_ops_.init = fuse_base::init_;
-  fuse_ops_.destroy = fuse_base::destroy_;
-  fuse_ops_.access = fuse_base::access_;
-  fuse_ops_.create = fuse_base::create_;
-#if FUSE_USE_VERSION < 30
-  fuse_ops_.ftruncate = fuse_base::ftruncate_;
-  fuse_ops_.fgetattr = fuse_base::fgetattr_;
-#endif
-  fuse_ops_.utimens = fuse_base::utimens_;
-#if FUSE_USE_VERSION < 30
-  fuse_ops_.flag_nullpath_ok = 0;
-  fuse_ops_.flag_nopath = 0;
-  fuse_ops_.flag_utime_omit_ok = 1;
-  fuse_ops_.flag_reserved = 0;
-#endif
-  fuse_ops_.fallocate = fuse_base::fallocate_;
+  fuse_ops_.setxattr = fuse_base::setxattr_;
+#endif // defined(HAS_SETXATTR)
 #if defined(__APPLE__)
   fuse_ops_.chflags = fuse_base::chflags_;
   fuse_ops_.fsetattr_x = fuse_base::fsetattr_x_;
@@ -91,7 +81,13 @@ fuse_base::fuse_base(app_config &config) : config_(config) {
   fuse_ops_.setcrtime = fuse_base::setcrtime_;
   fuse_ops_.setvolname = fuse_base::setvolname_;
   fuse_ops_.statfs_x = fuse_base::statfs_x_;
-#endif // __APPLE__
+#endif // defined(__APPLE__)
+#if FUSE_USE_VERSION < 30
+  fuse_ops_.flag_nullpath_ok = 0;
+  fuse_ops_.flag_nopath = 0;
+  fuse_ops_.flag_utime_omit_ok = 1;
+  fuse_ops_.flag_reserved = 0;
+#endif // FUSE_USE_VERSION < 30
 
   E_SUBSCRIBE_EXACT(unmount_requested, [this](const unmount_requested &) {
     std::thread([this]() { this->shutdown(); }).detach();
@@ -121,8 +117,8 @@ auto fuse_base::chflags_(const char *path, uint32_t flags) -> int {
 #endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-auto fuse_base::chmod_(const char *path, mode_t mode, struct fuse_file_info *fi)
-    -> int {
+auto fuse_base::chmod_(const char *path, mode_t mode,
+                       struct fuse_file_info *fi) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(
@@ -337,8 +333,8 @@ auto fuse_base::getxtimes_(const char *path, struct timespec *bkuptime,
 #endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-auto fuse_base::init_(struct fuse_conn_info *conn, struct fuse_config *cfg)
-    -> void * {
+auto fuse_base::init_(struct fuse_conn_info *conn,
+                      struct fuse_config *cfg) -> void * {
   REPERTORY_USES_FUNCTION_NAME();
 
   return execute_void_pointer_callback(function_name, [&]() -> void * {
@@ -480,8 +476,8 @@ auto fuse_base::read_(const char *path, char *buffer, size_t read_size,
 #if 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, fuse_readdir_flags flags)
-    -> int {
+                         struct fuse_file_info *fi,
+                         fuse_readdir_flags flags) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(
@@ -513,8 +509,8 @@ auto fuse_base::release_(const char *path, struct fuse_file_info *fi) -> int {
       });
 }
 
-auto fuse_base::releasedir_(const char *path, struct fuse_file_info *fi)
-    -> int {
+auto fuse_base::releasedir_(const char *path,
+                            struct fuse_file_info *fi) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(
@@ -524,8 +520,8 @@ auto fuse_base::releasedir_(const char *path, struct fuse_file_info *fi)
 }
 
 #if FUSE_USE_VERSION >= 30
-auto fuse_base::rename_(const char *from, const char *to, unsigned int flags)
-    -> int {
+auto fuse_base::rename_(const char *from, const char *to,
+                        unsigned int flags) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(
@@ -768,8 +764,8 @@ auto fuse_base::setattr_x_(const char *path, struct setattr_x *attr) -> int {
       });
 }
 
-auto fuse_base::setbkuptime_(const char *path, const struct timespec *bkuptime)
-    -> int {
+auto fuse_base::setbkuptime_(const char *path,
+                             const struct timespec *bkuptime) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(
@@ -778,8 +774,8 @@ auto fuse_base::setbkuptime_(const char *path, const struct timespec *bkuptime)
       });
 }
 
-auto fuse_base::setchgtime_(const char *path, const struct timespec *chgtime)
-    -> int {
+auto fuse_base::setchgtime_(const char *path,
+                            const struct timespec *chgtime) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(
@@ -788,8 +784,8 @@ auto fuse_base::setchgtime_(const char *path, const struct timespec *chgtime)
       });
 }
 
-auto fuse_base::setcrtime_(const char *path, const struct timespec *crtime)
-    -> int {
+auto fuse_base::setcrtime_(const char *path,
+                           const struct timespec *crtime) -> int {
   REPERTORY_USES_FUNCTION_NAME();
 
   return instance().execute_callback(