Simplify query_param
Static analysis notes that the values in these functions are never
initialized, and that a small section of the branch is no longer
possible to hit, now that a default case has been added in
4da0490bc07a458ad3fc7d586c7eabf6053c572f
Remove the dead code and initialize variables where appropriate.
Tested: Unit tests pass. Decent coverage here.
Change-Id: I42ec4678672fea5b21f98aaae05dfca0629652e7
Signed-off-by: Ed Tanous <ed@tanous.net>
diff --git a/redfish-core/include/utils/query_param.hpp b/redfish-core/include/utils/query_param.hpp
index dc06a3a..0f98763 100644
--- a/redfish-core/include/utils/query_param.hpp
+++ b/redfish-core/include/utils/query_param.hpp
@@ -205,7 +205,7 @@
// handlers so that handlers don't need to query again.
inline Query delegate(const QueryCapabilities& queryCapabilities, Query& query)
{
- Query delegated;
+ Query delegated{};
// delegate only
if (query.isOnly && queryCapabilities.canDelegateOnly)
{
@@ -376,7 +376,7 @@
inline std::optional<Query> parseParameters(boost::urls::params_view urlParams,
crow::Response& res)
{
- Query ret;
+ Query ret{};
for (const boost::urls::params_view::value_type& it : urlParams)
{
if (it.key == "only")
@@ -700,30 +700,22 @@
return "";
}
std::string str = "?$expand=";
- bool queryTypeExpected = false;
switch (query.expandType)
{
- case ExpandType::None:
- return "";
case ExpandType::Links:
- queryTypeExpected = true;
str += '~';
break;
case ExpandType::NotLinks:
- queryTypeExpected = true;
str += '.';
break;
case ExpandType::Both:
- queryTypeExpected = true;
str += '*';
break;
+ case ExpandType::None:
+ return "";
default:
return std::nullopt;
}
- if (!queryTypeExpected)
- {
- return std::nullopt;
- }
str += "($levels=";
str += std::to_string(query.expandLevel - 1);
str += ')';