Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6
am: 61ec157f7d
Change-Id: Ib5691e5f1fff2466f99bf949e23cfbc48ef79b98
diff --git a/roots.cpp b/roots.cpp
index 7d7d1bd..02c1ecb 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -38,7 +39,6 @@
#include <ext4_utils/wipe.h>
#include <fs_mgr.h>
-#include "common.h"
#include "mounts.h"
static struct fstab* fstab = nullptr;
@@ -77,7 +77,7 @@
if (path == nullptr || path[0] == '\0') return nullptr;
std::string str(path);
while (true) {
- Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str.c_str());
+ Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str);
if (result != nullptr || str == "/") {
return result;
}