summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/watchdog_service.cpp3
-rw-r--r--host-interface.cpp2
-rw-r--r--user_channel/user_mgmt.cpp4
3 files changed, 5 insertions, 4 deletions
diff --git a/app/watchdog_service.cpp b/app/watchdog_service.cpp
index c567ca9..0eedf1b 100644
--- a/app/watchdog_service.cpp
+++ b/app/watchdog_service.cpp
@@ -153,7 +153,8 @@ void WatchdogService::setProperty(const std::string& key, const T& val)
if (wasValid)
{
// Retry the request once in case the cached service was stale
- return setProperty(key, val);
+ setProperty(key, val);
+ return;
}
log<level::ERR>("WatchdogService: Method error setting property",
entry("PROPERTY=%s", key.c_str()));
diff --git a/host-interface.cpp b/host-interface.cpp
index 69ab376..1f9bfcb 100644
--- a/host-interface.cpp
+++ b/host-interface.cpp
@@ -54,7 +54,7 @@ void Host::execute(Base::Host::Command command)
std::placeholders::_1,
std::placeholders::_2));
- return ipmid_send_cmd_to_host(std::move(cmd));
+ ipmid_send_cmd_to_host(std::move(cmd));
}
// Called into by Command Manager
diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index bf43f88..d0dcb38 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -1635,7 +1635,7 @@ void UserAccess::initUserDataFile()
auto usrObj = managedObjs.find(usersPath);
if (usrObj != managedObjs.end())
{
- bool usrEnabled;
+ bool usrEnabled = false;
// User exist. Lets check and update other fileds
getUserObjProperties(usrObj->second, usrGrps, usrPriv,
@@ -1692,7 +1692,7 @@ void UserAccess::initUserDataFile()
{
std::vector<std::string> usrGrps;
std::string usrPriv, userName;
- bool usrEnabled;
+ bool usrEnabled = false;
std::string usrObjPath = std::string(usrObj.first);
if (getUserNameFromPath(usrObj.first.str, userName) != 0)
{
OpenPOWER on IntegriCloud