revert

src/drives/directory_iterator.cpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +31,8 @@ auto directory_iterator::fill_buffer(const remote::file_offset &offset,
                                      void *buffer,
                                      populate_stat_callback populate_stat)
     -> int {
+  constexpr const auto *function_name = static_cast<const char *>(__FUNCTION__);
+
   if (offset < items_.size()) {
     try {
       std::string item_name;
@@ -54,16 +56,18 @@ auto directory_iterator::fill_buffer(const remote::file_offset &offset,
       }
 
 #if FUSE_USE_VERSION >= 30
-      if (filler_function(buffer, &item_name[0], pst, offset + 1,
+      if (filler_function(buffer, item_name.data(), pst,
+                          static_cast<off_t>(offset + 1),
                           FUSE_FILL_DIR_PLUS) != 0) {
 #else
-      if (filler_function(buffer, &item_name[0], pst, offset + 1) != 0) {
+      if (filler_function(buffer, item_name.data(), pst,
+                          static_cast<off_t>(offset + 1)) != 0) {
 #endif
         errno = ENOMEM;
         return -1;
       }
     } catch (const std::exception &e) {
-      utils::error::raise_error(__FUNCTION__, e,
+      utils::error::raise_error(function_name, e,
                                 "failed to fill fuse directory buffer");
     }
 
@@ -121,13 +125,14 @@ auto directory_iterator::get_json(std::size_t offset, json &item) -> int {
 
 auto directory_iterator::get_next_directory_offset(
     const std::string &api_path) const -> std::size_t {
-  const auto it = std::find_if(
-      items_.begin(), items_.end(),
-      [&api_path](const auto &di) -> bool { return api_path == di.api_path; });
+  const auto iter = std::find_if(items_.begin(), items_.end(),
+                                 [&api_path](const auto &dir_item) -> bool {
+                                   return api_path == dir_item.api_path;
+                                 });
 
-  return (it == items_.end())
-             ? 0
-             : std::distance(items_.begin(), it) + std::size_t(1u);
+  return (iter == items_.end()) ? 0U
+                                : static_cast<std::size_t>(
+                                      std::distance(items_.begin(), iter) + 1);
 }
 
 auto directory_iterator::operator=(const directory_iterator &iterator) noexcept