Merge pull request #2135 from Dennis40816/iox-2055-fix-convert-edge-c…

…ases Fix convert edge cases
eclipse-iceoryx · Jan 2, 2024 · fe3ef2e · fe3ef2e
2 parents 53fce2d + e02d08b
commit fe3ef2e
Show file tree

Hide file tree

Showing 22 changed files with 605 additions and 526 deletions.
diff --git a/iceoryx_examples/iceperf/main_follower.cpp b/iceoryx_examples/iceperf/main_follower.cpp
@@ -47,12 +47,15 @@ int main(int argc, char* argv[])
         {
             constexpr decltype(EXIT_SUCCESS) MOO{EXIT_SUCCESS};
 
-            uint64_t intensity{0U};
-            if (!iox::convert::fromString(optarg, intensity))
+            auto result = iox::convert::from_string<uint64_t>(optarg);
+            if (!result.has_value())
             {
                 std::cerr << "Could not parse 'intensity' paramater!" << std::endl;
                 return EXIT_FAILURE;
             }
+
+            const auto intensity = result.value();
+
             if (intensity > 100)
             {
                 std::cerr << "Too high moo 'intensity'!" << std::endl;

diff --git a/iceoryx_examples/iceperf/main_leader.cpp b/iceoryx_examples/iceperf/main_leader.cpp
@@ -116,12 +116,16 @@ int main(int argc, char* argv[])
             }
             break;
         case 'n':
-            if (!iox::convert::fromString(optarg, settings.numberOfSamples))
+        {
+            auto result = iox::convert::from_string<uint64_t>(optarg);
+            if (!result.has_value())
             {
                 std::cerr << "Could not parse 'number-of-samples' paramater!" << std::endl;
                 return EXIT_FAILURE;
             }
+            settings.numberOfSamples = result.value();
             break;
+        }
         default:
             return EXIT_FAILURE;
         };

diff --git a/iceoryx_hoofs/cli/include/iox/cli/arguments.inl b/iceoryx_hoofs/cli/include/iox/cli/arguments.inl
@@ -26,15 +26,13 @@ namespace cli
 template <typename T>
 inline expected<T, Arguments::Error> Arguments::convertFromString(const Argument_t& stringValue) const noexcept
 {
-    // @todo iox-#2055 there are edge cases which lead to not initializing the value even when the return value of
-    // 'fromString' is true; value initialization can be removed when #2055 is fixed
-    T value{};
-    if (!convert::fromString(stringValue.c_str(), value))
+    auto result = convert::from_string<T>(stringValue.c_str());
+    if (!result.has_value())
     {
         std::cout << "\"" << stringValue.c_str() << "\" could not be converted to the requested type" << std::endl;
         return err(Error::UNABLE_TO_CONVERT_VALUE);
     }
-    return ok(value);
+    return ok(result.value());
 }
 
 template <>