Address compiler warnings #10

2023-11-08 19:53:12 -06:00
parent a7209184c8
commit f2c1f64f02
30 changed files with 737 additions and 615 deletions
--- a/include/drives/fuse/fuse_drive.hpp
+++ b/include/drives/fuse/fuse_drive.hpp
@ -45,6 +45,13 @@ public:

  ~fuse_drive() override = default;

+public:
+  fuse_drive(const fuse_drive &) = delete;
+  fuse_drive(fuse_drive &&) = delete;
+
+  auto operator=(const fuse_drive &) -> fuse_drive & = delete;
+  auto operator=(fuse_drive &&) -> fuse_drive & = delete;
+
 private:
  lock_data &lock_data_;
  i_provider &provider_;
@ -69,7 +76,7 @@ protected:

 #if FUSE_USE_VERSION >= 30
  [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode,
-                                struct fuse_file_info *fi)
+                                struct fuse_file_info *file_info)
      -> api_error override;
 #else
  [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode)
@ -78,7 +85,7 @@ protected:

 #if FUSE_USE_VERSION >= 30
  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid,
-                                struct fuse_file_info *fi)
+                                struct fuse_file_info *file_info)
      -> api_error override;
 #else
  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid)
@ -86,40 +93,40 @@ protected:
 #endif

  [[nodiscard]] auto create_impl(std::string api_path, mode_t mode,
-                                 struct fuse_file_info *fi)
+                                 struct fuse_file_info *file_info)
      -> api_error override;

  void destroy_impl(void *ptr) override;

  [[nodiscard]] auto fallocate_impl(std::string api_path, int mode,
                                    off_t offset, off_t length,
-                                    struct fuse_file_info *fi)
+                                    struct fuse_file_info *file_info)
      -> api_error override;

  [[nodiscard]] auto fgetattr_impl(std::string api_path, struct stat *st,
-                                   struct fuse_file_info *fi)
+                                   struct fuse_file_info *file_info)
      -> api_error override;

 #ifdef __APPLE__
  [[nodiscard]] auto fsetattr_x_impl(std::string api_path,
                                     struct setattr_x *attr,
-                                     struct fuse_file_info *fi)
+                                     struct fuse_file_info *file_info)
      -> api_error override;
 #endif // __APPLE__

  [[nodiscard]] auto fsync_impl(std::string api_path, int datasync,
-                                struct fuse_file_info *fi)
+                                struct fuse_file_info *file_info)
      -> api_error override;

 #if FUSE_USE_VERSION < 30
  [[nodiscard]] auto ftruncate_impl(std::string api_path, off_t size,
-                                    struct fuse_file_info *fi)
+                                    struct fuse_file_info *file_info)
      -> api_error override;
 #endif

 #if FUSE_USE_VERSION >= 30
  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *st,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *file_info)
      -> api_error override;
 #else
  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *st)
@ -145,37 +152,38 @@ protected:

  void notify_fuse_main_exit(int &ret) override;

-  [[nodiscard]] auto open_impl(std::string api_path, struct fuse_file_info *fi)
+  [[nodiscard]] auto open_impl(std::string api_path,
+                               struct fuse_file_info *file_info)
      -> api_error override;

  [[nodiscard]] auto opendir_impl(std::string api_path,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *file_info)
      -> api_error override;

  [[nodiscard]] auto read_impl(std::string api_path, char *buffer,
                               size_t read_size, off_t read_offset,
-                               struct fuse_file_info *fi,
+                               struct fuse_file_info *file_info,
                               std::size_t &bytes_read) -> api_error override;

 #if 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 *fi,
+                                  struct fuse_file_info *file_info,
                                  fuse_readdir_flags flags)
      -> api_error override;
 #else
  [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
                                  fuse_fill_dir_t fuse_fill_dir, off_t offset,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *file_info)
      -> api_error override;
 #endif

  [[nodiscard]] auto release_impl(std::string api_path,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *file_info)
      -> api_error override;

  [[nodiscard]] auto releasedir_impl(std::string api_path,
-                                     struct fuse_file_info *fi)
+                                     struct fuse_file_info *file_info)
      -> api_error override;

 #if FUSE_USE_VERSION >= 30
@ -251,7 +259,7 @@ protected:

 #if FUSE_USE_VERSION >= 30
  [[nodiscard]] auto truncate_impl(std::string api_path, off_t size,
-                                   struct fuse_file_info *fi)
+                                   struct fuse_file_info *file_info)
      -> api_error override;
 #else
  [[nodiscard]] auto truncate_impl(std::string api_path, off_t size)
@ -263,7 +271,7 @@ protected:
 #if FUSE_USE_VERSION >= 30
  [[nodiscard]] auto utimens_impl(std::string api_path,
                                  const struct timespec tv[2],
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *file_info)
      -> api_error override;
 #else
  [[nodiscard]] auto utimens_impl(std::string api_path,
@ -273,7 +281,7 @@ protected:

  [[nodiscard]] auto write_impl(std::string api_path, const char *buffer,
                                size_t write_size, off_t write_offset,
-                                struct fuse_file_info *fi,
+                                struct fuse_file_info *file_info,
                                std::size_t &bytes_written)
      -> api_error override;

@ -308,7 +316,8 @@ public:
  [[nodiscard]] auto is_processing(const std::string &api_path) const
      -> bool override;

-  void populate_stat(const directory_item &di, struct stat &st) const override;
+  void populate_stat(const directory_item &dir_item,
+                     struct stat &st) const override;

  [[nodiscard]] auto rename_directory(const std::string &from_api_path,
                                      const std::string &to_api_path)
--- a/include/drives/fuse/i_fuse_drive.hpp
+++ b/include/drives/fuse/i_fuse_drive.hpp
@ -69,7 +69,7 @@ public:
  [[nodiscard]] virtual auto is_processing(const std::string &api_path) const
      -> bool = 0;

-  virtual void populate_stat(const directory_item &di,
+  virtual void populate_stat(const directory_item &dir_item,
                             struct stat &st) const = 0;

  [[nodiscard]] virtual auto rename_directory(const std::string &from_api_path,
--- a/include/drives/fuse/remotefuse/remote_server.hpp
+++ b/include/drives/fuse/remotefuse/remote_server.hpp
@ -237,12 +237,12 @@ public:
  }

  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
-                                                    json &jsonData)
+                                                    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 &jsonData) -> packet::error_type override;
+      std::uint32_t page, json &json_data) -> packet::error_type override;

  [[nodiscard]] auto
  json_release_directory_snapshot(const std::string &path,
@ -254,7 +254,7 @@ public:
      -> packet::error_type override;

  [[nodiscard]] auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
-                                    UINT32 flags, BOOLEAN &wasClosed)
+                                    UINT32 flags, BOOLEAN &was_closed)
      -> packet::error_type override;

  [[nodiscard]] auto winfsp_close(PVOID file_desc)
@ -275,8 +275,8 @@ public:

  [[nodiscard]] auto
  winfsp_get_security_by_name(PWSTR file_name, PUINT32 attributes,
-                              std::uint64_t * /*securityDescriptorSize*/,
-                              std::wstring & /*strDescriptor*/)
+                              std::uint64_t * /*security_descriptor_size*/,
+                              std::wstring & /*str_descriptor*/)
      -> packet::error_type override;

  [[nodiscard]] auto winfsp_get_volume_info(UINT64 &total_size,
@ -317,7 +317,7 @@ public:
      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 newSize,
+  [[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;