Clean up utils
Lots of the utils functions have been superceeded or replaced by std::
implementations, or are no longer needed because of the removal of
middlewares.
Tested:
Ran on a bmc with this implemented. Pulled down the webui, and
observed no issues. Code compiles and passes clang-tidy cert checks.
Change-Id: If29bb5f4ba9979912aeb2a8fa4cbd9f4e4f32006
Signed-off-by: Ed Tanous <ed@tanous.net>
diff --git a/src/crow_test.cpp b/src/crow_test.cpp
index 4e0bd40..a685220 100644
--- a/src/crow_test.cpp
+++ b/src/crow_test.cpp
@@ -98,19 +98,19 @@
static_assert(black_magic::isValid("<int><int><int>"), "valid url");
static_assert(!black_magic::isValid("<int><int<<int>"), "invalid url");
static_assert(!black_magic::isValid("nt>"), "invalid url");
- ASSERT_EQUAL(1, black_magic::get_parameter_tag("<int>"));
- ASSERT_EQUAL(2, black_magic::get_parameter_tag("<uint>"));
- ASSERT_EQUAL(3, black_magic::get_parameter_tag("<float>"));
- ASSERT_EQUAL(3, black_magic::get_parameter_tag("<double>"));
- ASSERT_EQUAL(4, black_magic::get_parameter_tag("<str>"));
- ASSERT_EQUAL(4, black_magic::get_parameter_tag("<string>"));
- ASSERT_EQUAL(5, black_magic::get_parameter_tag("<path>"));
+ ASSERT_EQUAL(1, black_magic::getParameterTag("<int>"));
+ ASSERT_EQUAL(2, black_magic::getParameterTag("<uint>"));
+ ASSERT_EQUAL(3, black_magic::getParameterTag("<float>"));
+ ASSERT_EQUAL(3, black_magic::getParameterTag("<double>"));
+ ASSERT_EQUAL(4, black_magic::getParameterTag("<str>"));
+ ASSERT_EQUAL(4, black_magic::getParameterTag("<string>"));
+ ASSERT_EQUAL(5, black_magic::getParameterTag("<path>"));
ASSERT_EQUAL(6 * 6 + 6 + 1,
- black_magic::get_parameter_tag("<int><int><int>"));
+ black_magic::getParameterTag("<int><int><int>"));
ASSERT_EQUAL(6 * 6 + 6 + 2,
- black_magic::get_parameter_tag("<uint><int><int>"));
+ black_magic::getParameterTag("<uint><int><int>"));
ASSERT_EQUAL(6 * 6 + 6 * 3 + 2,
- black_magic::get_parameter_tag("<uint><double><int>"));
+ black_magic::getParameterTag("<uint><double><int>"));
// url definition parsed in compile time, build into *one number*, and given
// to template argument