Consolidate all util.hpp
This deletes all lower level util.hpp and cats them
into the top level util.hpp to avoid name conflicts.
Change-Id: Ia11e4a08053a3970b0aadf21d1156ab26def36bd
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/sysfs/sysfsread.hpp b/sysfs/sysfsread.hpp
index 4cd2a78..aa769c4 100644
--- a/sysfs/sysfsread.hpp
+++ b/sysfs/sysfsread.hpp
@@ -1,7 +1,7 @@
#pragma once
#include "interfaces.hpp"
-#include "sysfs/util.hpp"
+#include "util.hpp"
#include <string>
diff --git a/sysfs/sysfswrite.hpp b/sysfs/sysfswrite.hpp
index f877d4a..990855e 100644
--- a/sysfs/sysfswrite.hpp
+++ b/sysfs/sysfswrite.hpp
@@ -1,7 +1,7 @@
#pragma once
#include "interfaces.hpp"
-#include "sysfs/util.hpp"
+#include "util.hpp"
#include <string>
diff --git a/sysfs/util.cpp b/sysfs/util.cpp
index d73ec0f..da678ce 100644
--- a/sysfs/util.cpp
+++ b/sysfs/util.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "sysfs/util.hpp"
+#include "util.hpp"
#include <filesystem>
#include <iostream>
diff --git a/sysfs/util.hpp b/sysfs/util.hpp
deleted file mode 100644
index 2d4c274..0000000
--- a/sysfs/util.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <string>
-
-/*
- * Given a path that optionally has a glob portion, fill it out.
- */
-std::string FixupPath(std::string original);