iox-eclipse-iceoryx#404 Address review findings from Mathias Kraus

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
ApexAI · Feb 3, 2021 · a0c9f40 · a0c9f40
1 parent e3c26ec
commit a0c9f40
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/iceoryx_examples/iceperf/roudi_main_static_config.cpp b/iceoryx_examples/iceperf/roudi_main_static_config.cpp
@@ -25,13 +25,15 @@ int main(int argc, char* argv[])
     static constexpr uint32_t ONE_MEGABYTE = 1024U * 1024;
 
     iox::config::CmdLineParserConfigFileOption cmdLineParser;
-    auto cmdLineArgs = cmdLineParser.parse(argc, argv).or_else([](iox::config::CmdLineParserResult& error) {
-        if (error == iox::config::CmdLineParserResult::UNKNOWN_OPTION_USED)
+    auto cmdLineArgs = cmdLineParser.parse(argc, argv);
+    if (cmdLineArgs.has_error())
+    {
+        if (cmdLineArgs.get_error() == iox::config::CmdLineParserResult::UNKNOWN_OPTION_USED)
         {
             iox::LogFatal() << "Unable to parse command line arguments!";
-            std::terminate();
+            return EXIT_FAILURE;
         }
-    });
+    }
 
     iox::RouDiConfig_t roudiConfig;
     // roudiConfig.setDefaults(); can be used if you want to use the default config only.

diff --git a/iceoryx_posh/include/iceoryx_posh/roudi/roudi_cmd_line_parser.hpp b/iceoryx_posh/include/iceoryx_posh/roudi/roudi_cmd_line_parser.hpp
@@ -29,7 +29,7 @@ namespace config
 enum class CmdLineParserResult
 {
     UNKNOWN_OPTION_USED,
-    USAGE_OUTPUT_REQUESTED /// @todo use this instead of CmdLineArgs_t.run after modularisation of RouDi
+    INFO_OUTPUT_ONLY /// @todo use this instead of CmdLineArgs_t.run after modularisation of RouDi
 };
 
 class CmdLineParser

diff --git a/iceoryx_posh/source/roudi/application/roudi_main.cpp b/iceoryx_posh/source/roudi/application/roudi_main.cpp
@@ -25,27 +25,28 @@ int main(int argc, char* argv[])
     using iox::roudi::IceOryxRouDiApp;
 
     iox::config::CmdLineParserConfigFileOption cmdLineParser;
-    auto cmdLineArgs = cmdLineParser.parse(argc, argv).or_else([](iox::config::CmdLineParserResult& error) {
-        if (error == iox::config::CmdLineParserResult::UNKNOWN_OPTION_USED)
+    auto cmdLineArgs = cmdLineParser.parse(argc, argv);
+    if (cmdLineArgs.has_error())
+    {
+        if (cmdLineArgs.get_error() == iox::config::CmdLineParserResult::UNKNOWN_OPTION_USED)
         {
             iox::LogFatal() << "Unable to parse command line arguments!";
-            std::terminate();
+            return EXIT_FAILURE;
         }
-    });
+    }
 
     iox::config::TomlRouDiConfigFileProvider configFileProvider(cmdLineArgs.value());
 
-    iox::RouDiConfig_t roudiConfig =
-        configFileProvider.parse()
-            .or_else([](iox::roudi::RouDiConfigFileParseError& parseResult) {
-                iox::LogFatal() << "Couldn't parse config file. Error: "
-                                << iox::cxx::convertEnumToString(iox::roudi::ROUDI_CONFIG_FILE_PARSE_ERROR_STRINGS,
-                                                                 parseResult);
-                std::terminate();
-            })
-            .value();
+    auto roudiConfig = configFileProvider.parse();
+    if (roudiConfig.has_error())
+    {
+        iox::LogFatal() << "Couldn't parse config file. Error: "
+                        << iox::cxx::convertEnumToString(iox::roudi::ROUDI_CONFIG_FILE_PARSE_ERROR_STRINGS,
+                                                         roudiConfig.get_error());
+        return EXIT_FAILURE;
+    }
 
-    IceOryxRouDiApp roudi(cmdLineArgs.value(), roudiConfig);
+    IceOryxRouDiApp roudi(cmdLineArgs.value(), roudiConfig.value());
 
     return roudi.run();
 }
diff --git a/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp b/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp
@@ -377,10 +377,10 @@ TEST_F(CmdLineParser_test, UniqueIdLongOptionLeadsToCorrectUniqueId)
     char* args[numberOfArgs];
     char appName[] = "./foo";
     char option[] = "--unique-roudi-id";
-    char wrongValue[] = "4242";
+    char value[] = "4242";
     args[0] = &appName[0];
     args[1] = &option[0];
-    args[2] = &wrongValue[0];
+    args[2] = &value[0];
 
     iox::config::CmdLineParser sut;
     auto result = sut.parse(numberOfArgs, args);
@@ -396,10 +396,10 @@ TEST_F(CmdLineParser_test, UniqueIdShortOptionLeadsToCorrectUniqueId)
     char* args[numberOfArgs];
     char appName[] = "./foo";
     char option[] = "-u";
-    char wrongValue[] = "4242";
+    char value[] = "4242";
     args[0] = &appName[0];
     args[1] = &option[0];
-    args[2] = &wrongValue[0];
+    args[2] = &value[0];
 
     iox::config::CmdLineParser sut;
     auto result = sut.parse(numberOfArgs, args);