commit 471b9821901f9d76c172b2bf3fa11a53c6a8b437
author Mark Salyzyn <salyzyn@google.com> Wed Aug 29 10:44:33 2018 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Oct 16 11:14:06 2018 -0700
tree 34d3cbb9c92c85f942752c2393559608ec2149bc
parent cd3eba23a230bccbfa5a81fe9ff12aa9bee10c8e

fs_mgr: string literal cleanup

Cleanup remove any unnecessary string literals.

Test: compile
Bug: 109821105
Change-Id: Id22629201b8d874afb6b8f9157fa474fdfcf3f43

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 4934f5a..0cc6194 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -163,7 +163,7 @@
     auto candidate = fs_mgr_get_overlayfs_candidate(mount_point);
     if (candidate.empty()) return "";
 
-    return "override_creds=off,"s + kLowerdirOption + mount_point + "," + kUpperdirOption +
+    return "override_creds=off," + kLowerdirOption + mount_point + "," + kUpperdirOption +
            candidate + kUpperName + ",workdir=" + candidate + kWorkName;
 }
 
@@ -443,7 +443,7 @@
     if (!fs_mgr_access(top)) return false;
 
     auto cleanup_all = mount_point.empty();
-    const auto oldpath = top + (cleanup_all ? "" : ("/"s + mount_point));
+    const auto oldpath = top + (cleanup_all ? "" : ("/" + mount_point));
     const auto newpath = oldpath + ".teardown";
     auto ret = fs_mgr_rm_all(newpath);
     auto save_errno = errno;
@@ -671,7 +671,7 @@
 
     auto ret = system((mnt_type == "f2fs")
                               ? ((kMkF2fs + " -d1 " + scratch_device).c_str())
-                              : ((kMkExt4 + " -b 4096 -t ext4 -m 0 -M "s + kScratchMountPoint +
+                              : ((kMkExt4 + " -b 4096 -t ext4 -m 0 -M " + kScratchMountPoint +
                                   " -O has_journal " + scratch_device)
                                          .c_str()));
     if (ret) {