commit d4d25793d79eeee62a5b7f199410c0578070dce1
author Ed Tanous <ed@tanous.net> Tue Sep 29 15:15:03 2020 -0700
committer Ed Tanous <ed@tanous.net> Mon Oct 05 17:42:59 2020 +0000
tree 0b2a6c8a5fa4c6f97d5b69cbf850dc0daed87234
parent f2a4a60698a41fbf23e933daaea5df66cde19e53

Implement bugprone-branch-clone compliance

As part of getting the clang-tidy bugprone tests running, these
conditionals were found to have duplicate entries, or be somewhat
nonsensical.

Tested: clang-tidy now passes with the branch-compliance check set.
Change-Id: Ibec106f3bbd866fc471a1fc56bd8cdd5d44024e0

include/authorization.hpp

diff --git a/include/authorization.hpp b/include/authorization.hpp
index 1fd1b12..524064e 100644
--- a/include/authorization.hpp
+++ b/include/authorization.hpp
@@ -212,8 +212,8 @@
         {
             return true;
         }
-        else if (crow::webroutes::routes.find(std::string(req.url)) !=
-                 crow::webroutes::routes.end())
+        if (crow::webroutes::routes.find(std::string(req.url)) !=
+            crow::webroutes::routes.end())
         {
             return true;
         }

include/openbmc_dbus_rest.hpp

diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index f8d5d4a..6bb09d0 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -1112,23 +1112,7 @@
             thisElement = &response.back();
         }
 
-        if (typeCode == "s")
-        {
-            r = readMessageItem<char*>(typeCode, m, *thisElement);
-            if (r < 0)
-            {
-                return r;
-            }
-        }
-        else if (typeCode == "g")
-        {
-            r = readMessageItem<char*>(typeCode, m, *thisElement);
-            if (r < 0)
-            {
-                return r;
-            }
-        }
-        else if (typeCode == "o")
+        if (typeCode == "s" || typeCode == "g" || typeCode == "o")
         {
             r = readMessageItem<char*>(typeCode, m, *thisElement);
             if (r < 0)