diff --git a/docs/module/lifecycle_client_lib/model/structural_view.uxf b/docs/module/lifecycle_client_lib/model/structural_view.uxf
index 3237b39bc..f97e7f3c5 100644
--- a/docs/module/lifecycle_client_lib/model/structural_view.uxf
+++ b/docs/module/lifecycle_client_lib/model/structural_view.uxf
@@ -6,7 +6,7 @@ Operation
+ run(amp::stop_token stop_token): std::int32_t virtual = 0UMLClass171855486135score::mw::lifecycle::ApplicationContext
--
Operations
-+ ApplicationContext(const int32_t argc, const score::StringLiteral argv[])
++ ApplicationContext(const int32_t argc, const char* const argv[])
+ get_arguments(): const std::vector<std::string>& const noexcept
+ get_argument(const amp::string_view flag): std::string const noexcept
--
@@ -39,7 +39,7 @@ manages10;130;10;10
operation
+ initialize(const ApplicationContext&): std::int32_t override
+ run(amp::stop_token stop_token): std::int32_t override
-+ AasApplicationContainer(cosnt std::int32_t argc, const score::StringLiteral* argv, const std::size_t count_expected_applications): noexcept
++ AasApplicationContainer(const std::int32_t argc, const char* const argv[], const std::size_t count_expected_applications): noexcept
+ With<App,...Args>(Args&&.. args) : AasApplicationContainer&
+ Launch() : std::int32_t
--
diff --git a/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.cpp b/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.cpp
index c57fab084..ba4242d01 100644
--- a/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.cpp
+++ b/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.cpp
@@ -119,15 +119,15 @@ std::string MonitorImpl::getIpcPath(void) noexcept(false)
}
std::unique_ptr MonitorImpl::read_flatbuffer_file() const {
- const char* configFilePath = getenv("CONFIG_PATH");
- if(!configFilePath) {
+ const std::string_view configFilePath {getenv("CONFIG_PATH")};
+ if(!configFilePath.data()) {
return nullptr;
}
logger_r.LogDebug() << "Attempting to read config file from " << configFilePath;
std::ifstream infile;
- infile.open(configFilePath, std::ios::binary | std::ios::in);
+ infile.open(configFilePath.data(), std::ios::binary | std::ios::in);
if (!infile.is_open()) {
return nullptr;
}
diff --git a/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.cpp b/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.cpp
index 02b383133..4e2bccd21 100644
--- a/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.cpp
+++ b/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.cpp
@@ -23,9 +23,8 @@ namespace mw
namespace lifecycle
{
-
AasApplicationContainer::AasApplicationContainer(const std::int32_t argc,
- const score::StringLiteral* argv,
+ const char* const argv[],
const std::size_t count_expected_applications) noexcept
: Application{}, context_{argc, argv}, applications_{}, count_expected_applications_{count_expected_applications}
{
diff --git a/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.h b/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.h
index fa93525a3..ee5b1d606 100644
--- a/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.h
+++ b/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.h
@@ -41,7 +41,7 @@ class AasApplicationContainer : public Application
* @param count_expected_applications The expected number of applications.
*/
AasApplicationContainer(const std::int32_t argc,
- const score::StringLiteral* argv,
+ const char* const argv[],
const std::size_t count_expected_applications) noexcept;
AasApplicationContainer(const AasApplicationContainer&) = delete;
@@ -69,7 +69,7 @@ class AasApplicationContainer : public Application
AasApplicationContainer& With(Args&&... args)
{
SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(applications_.size() + 1 <= count_expected_applications_,
- "Passed more Applications than expected");
+ "Passed more Applications than expected");
applications_.push_back(std::make_unique(std::forward(args)...));
return *this;
}
diff --git a/score/launch_manager/lifecycle_client/src/applicationcontext.cpp b/score/launch_manager/lifecycle_client/src/applicationcontext.cpp
index 263e785ce..f05212673 100644
--- a/score/launch_manager/lifecycle_client/src/applicationcontext.cpp
+++ b/score/launch_manager/lifecycle_client/src/applicationcontext.cpp
@@ -18,7 +18,7 @@
score::mw::lifecycle::ApplicationContext::ApplicationContext(
const std::int32_t argc,
- const score::StringLiteral argv[]) // NOLINT(modernize-avoid-c-arrays): array tolerated for command line arguments
+ const char* const argv[]) // NOLINT(modernize-avoid-c-arrays): array tolerated for command line arguments
: m_args(argv, argv + argc), m_app_path(argv[0]) // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic): array
// tolerated for command line arguments
{
diff --git a/score/launch_manager/lifecycle_client/src/applicationcontext.h b/score/launch_manager/lifecycle_client/src/applicationcontext.h
index 74a7e5a2c..951128b5f 100644
--- a/score/launch_manager/lifecycle_client/src/applicationcontext.h
+++ b/score/launch_manager/lifecycle_client/src/applicationcontext.h
@@ -15,9 +15,9 @@
#define SCORE_MW_LIFECYCLE_APPLICATIONCONTEXT_H
#include "score/memory/string_literal.h"
-#include
#include
#include
+#include
#include
namespace score
@@ -38,7 +38,7 @@ class ApplicationContext
public:
/* NOLINTNEXTLINE(modernize-avoid-c-arrays): array tolerated for command line arguments */
- ApplicationContext(const std::int32_t argc, const score::StringLiteral argv[]);
+ ApplicationContext(const std::int32_t argc, const char* const argv[]);
/**
* \brief Utility function.
diff --git a/score/launch_manager/lifecycle_client/src/applicationcontextmock.cpp b/score/launch_manager/lifecycle_client/src/applicationcontextmock.cpp
index 31f9da6c0..f591fd9f6 100644
--- a/score/launch_manager/lifecycle_client/src/applicationcontextmock.cpp
+++ b/score/launch_manager/lifecycle_client/src/applicationcontextmock.cpp
@@ -21,7 +21,7 @@ namespace
auto& GetConstructorCallback() noexcept
{
- static std::function constructor_callback{};
+ static std::function constructor_callback{};
return constructor_callback;
}
@@ -41,7 +41,7 @@ auto& GetGetArgumentCallback() noexcept
score::mw::lifecycle::ApplicationContextMock::ApplicationContextMock()
{
- GetConstructorCallback() = [this](const std::int32_t argc, const score::StringLiteral argv[]) {
+ GetConstructorCallback() = [this](const std::int32_t argc, const char* const argv[]) {
ctor(argc, argv);
};
GetGetArgumentsCallback() = [this]() -> decltype(auto) {
@@ -59,7 +59,7 @@ score::mw::lifecycle::ApplicationContextMock::~ApplicationContextMock()
GetGetArgumentCallback() = nullptr;
}
-score::mw::lifecycle::ApplicationContext::ApplicationContext(const std::int32_t argc, const score::StringLiteral argv[])
+score::mw::lifecycle::ApplicationContext::ApplicationContext(const std::int32_t argc, const char* const argv[])
{
auto& constructor_callback = GetConstructorCallback();
constructor_callback(argc, argv);
diff --git a/score/launch_manager/lifecycle_client/src/applicationcontextmock.h b/score/launch_manager/lifecycle_client/src/applicationcontextmock.h
index 8ea9615b9..119b4aca6 100644
--- a/score/launch_manager/lifecycle_client/src/applicationcontextmock.h
+++ b/score/launch_manager/lifecycle_client/src/applicationcontextmock.h
@@ -36,7 +36,7 @@ class ApplicationContextMock
~ApplicationContextMock();
MOCK_METHOD(const std::vector&, get_arguments, (), ());
- MOCK_METHOD(void, ctor, (const std::int32_t argc, const score::StringLiteral argv[]), ());
+ MOCK_METHOD(void, ctor, (const std::int32_t argc, const char* const argv[]), ());
MOCK_METHOD(std::string, get_argument, (const std::string_view flag), ());
};
diff --git a/score/launch_manager/lifecycle_client/src/lifecyclemanager.cpp b/score/launch_manager/lifecycle_client/src/lifecyclemanager.cpp
index 8f505819c..08c42fc52 100644
--- a/score/launch_manager/lifecycle_client/src/lifecyclemanager.cpp
+++ b/score/launch_manager/lifecycle_client/src/lifecyclemanager.cpp
@@ -94,7 +94,7 @@ std::int32_t score::mw::lifecycle::LifeCycleManager::run(Application& app, const
const auto run_status = m_app->Run(m_stop_source.get_token()); // LCOV_EXCL_BR_LINE
if (run_status != 0)
{
- mw::log::LogError() << "Error occured during Run";
+ mw::log::LogError() << "Error occurred during Run";
}
mw::log::LogInfo() << "Shutting down Application";
mw::log::LogInfo() << "Application" << application_name << "run finished with" << run_status;
diff --git a/score/launch_manager/lifecycle_client/src/runapplication.h b/score/launch_manager/lifecycle_client/src/runapplication.h
index 2fa5d8a2e..d315224ec 100644
--- a/score/launch_manager/lifecycle_client/src/runapplication.h
+++ b/score/launch_manager/lifecycle_client/src/runapplication.h
@@ -15,7 +15,6 @@
#define SCORE_MW_LIFECYCLE_RUNAPPLICATION_H
#include "score/mw/lifecycle/lifecycle_client/lifecyclemanager.h"
-#include "score/memory/string_literal.h"
#include "score/mw/lifecycle/lifecycle_client/applicationcontext.h"
#include
@@ -32,8 +31,7 @@ class Run final
{
public:
Run(const std::int32_t argc,
- const score::StringLiteral*
- argv) /* NOLINT(modernize-avoid-c-arrays): array tolerated for command line arguments */
+ const char* const argv[]) /* NOLINT(modernize-avoid-c-arrays): array tolerated for command line arguments */
: context_{argc, argv}
{
}
@@ -66,7 +64,7 @@ class Run final
template
/* NOLINTNEXTLINE(modernize-avoid-c-arrays): array tolerated for command line arguments */
-std::int32_t run_application(const std::int32_t argc, const score::StringLiteral argv[], Args&&... args)
+std::int32_t run_application(const std::int32_t argc, const char* const argv[], Args&&... args)
{
score::mw::lifecycle::Run runner(argc, argv);
return runner.AsPosixProcess(std::forward(args)...);
@@ -77,4 +75,3 @@ std::int32_t run_application(const std::int32_t argc, const score::StringLiteral
} // namespace score
#endif // SCORE_MW_LIFECYCLE_RUNAPPLICATION_H
-