commit 2b6683fe6b32867cb39a406640d76329d8108f6e
author Willy Tu <wltu@google.com> Sun Feb 20 01:45:42 2022 -0800
committer Willy Tu <wltu@google.com> Tue Feb 22 18:06:07 2022 -0800
tree bdf88c3bef8f87a1e37a2ee0b94328440b221601
parent fdebaa30f75727f0c7c4026024a1a4185f615093

binarystore: Add std::optional for optional config options

The `maxSizeBytes` was using 0 size by default instead of skipping it.
Letting `config.maxSizeBytes` be std::optional allow us to have more
control to see if the 0 value is expected or nullopt.

Change-Id: I128216825609909c489cbd5471b324d88d3aa25b
Signed-off-by: Willy Tu <wltu@google.com>

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 5cf6c10..bb45f55 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,11 +61,13 @@
             return nullptr;
         }
 
-        log<level::INFO>("Loading from config with",
-                         entry("BASE_ID=%s", config.blobBaseId.c_str()),
-                         entry("FILE=%s", config.sysFilePath.c_str()),
-                         entry("MAX_SIZE=%llx", static_cast<unsigned long long>(
-                                                    config.maxSizeBytes)));
+        log<level::INFO>(
+            "Loading from config with",
+            entry("BASE_ID=%s", config.blobBaseId.c_str()),
+            entry("FILE=%s", config.sysFilePath.c_str()),
+            entry("MAX_SIZE=%llx",
+                  static_cast<unsigned long long>(
+                      config.maxSizeBytes ? *config.maxSizeBytes : 0)));
 
         auto file = std::make_unique<binstore::SysFileImpl>(config.sysFilePath,
                                                             config.offsetBytes);

src/sys_file_impl.cpp

diff --git a/src/sys_file_impl.cpp b/src/sys_file_impl.cpp
index 243d82d..9fab76a 100644
--- a/src/sys_file_impl.cpp
+++ b/src/sys_file_impl.cpp
@@ -1,5 +1,6 @@
 #include "sys_file_impl.hpp"
 
+#include <optional>
 #include <system_error>
 
 using namespace std::string_literals;
@@ -19,12 +20,12 @@
 
 } // namespace
 
-SysFileImpl::SysFileImpl(const std::string& path, size_t offset,
+SysFileImpl::SysFileImpl(const std::string& path, std::optional<size_t> offset,
                          const internal::Sys* sys) :
     sys(sys)
 {
     fd_ = sys->open(path.c_str(), O_RDWR);
-    offset_ = offset;
+    offset_ = offset ? *offset : 0;
 
     if (fd_ < 0)
     {