minor fix

Author: denisichh

runtime-light/state/component-state.cpp

@@ -86,8 +86,9 @@ void ComponentState::parse_runtime_config_arg(std::string_view value_view) noexc
   }
 
   struct stat stat {};
-  if (auto stat_result{k2::stat({runtime_config_path.get(), runtime_config_path_size}, std::addressof(stat))}; !stat_result.has_value()) [[unlikely]] {
-    return kphp::log::warning("error getting runtime-config stat: error code -> {}", stat_result.error());
+  if (auto expected_stat_result{k2::stat({runtime_config_path.get(), runtime_config_path_size}, std::addressof(stat))}; !expected_stat_result.has_value())
+      [[unlikely]] {
+    return kphp::log::warning("error getting runtime-config stat: error code -> {}", expected_stat_result.error());
   }
 
   const auto runtime_config_mem{std::unique_ptr<char, decltype(std::addressof(kphp::memory::script::free))>{

runtime-light/stdlib/file/file-system-functions.h

@@ -203,8 +203,8 @@ inline Optional<string> f$file_get_contents(const string& stream) noexcept {
 inline Optional<array<string>> f$file(const string& name) noexcept {
   struct stat stat_buf {};
 
-  auto open_result{kphp::fs::file::open(name.c_str(), "r")};
-  if (!open_result.has_value()) {
+  auto expected_file{kphp::fs::file::open(name.c_str(), "r")};
+  if (!expected_file.has_value()) {
     return false;
   }
   if (!k2::stat(name.c_str(), std::addressof(stat_buf)).has_value()) {
@@ -221,15 +221,14 @@ inline Optional<array<string>> f$file(const string& name) noexcept {
     return false;
   }
 
-  auto& file{open_result.value()};
-
   kphp::stl::vector<std::byte, kphp::memory::script_allocator> file_content{size};
-  if (auto rd_status{file.read(file_content)}; !rd_status.has_value() || rd_status.value() < size) {
-    return false;
+  {
+    auto& file{std::move(*expected_file)};
+    if (auto expected_read_result{file.read(file_content)}; !expected_read_result.has_value() || *expected_read_result < size) {
+      return false;
+    }
   }
 
-  file.close();
-
   array<string> result;
   int32_t prev{-1};
   for (size_t i{0}; i < size; i++) {

runtime-light/stdlib/kml/kml-file-api.h

@@ -120,8 +120,8 @@ class dir_traverser final : public kphp::kml::dir_traverser_interface<dir_traver
     }
 
     struct stat stat {};
-    if (auto stat_result{k2::stat(direntry_path, std::addressof(stat))}; !stat_result.has_value()) [[unlikely]] {
-      kphp::log::warning("[kml] failed to get stat: error code -> {}, path -> {}", stat_result.error(), direntry_path);
+    if (auto expected_stat_result{k2::stat(direntry_path, std::addressof(stat))}; !expected_stat_result.has_value()) [[unlikely]] {
+      kphp::log::warning("[kml] failed to get stat: error code -> {}, path -> {}", expected_stat_result.error(), direntry_path);
       return std::nullopt;
     }