summaryrefslogtreecommitdiffstats
path: root/fs_mgr/fs_mgr_fstab.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2018-06-07 15:31:51 -0700
committerTom Cherry <tomcherry@google.com>2018-06-07 16:49:01 -0700
commite6eabf42f2ddf17f774e2022da970d678540d749 (patch)
treec5e444b0a171cbc656085f1379447f823351e205 /fs_mgr/fs_mgr_fstab.cpp
parentae74e42d2557b93a3da9ef75c51ef1f6aab3cc0a (diff)
downloadsystem_core-e6eabf42f2ddf17f774e2022da970d678540d749.tar.gz
system_core-e6eabf42f2ddf17f774e2022da970d678540d749.tar.bz2
system_core-e6eabf42f2ddf17f774e2022da970d678540d749.zip
fs_mgr: remove some unused functions
Test: build Change-Id: I8a44f2f777fff369df06c73f06d53e448826f7b5
Diffstat (limited to 'fs_mgr/fs_mgr_fstab.cpp')
-rw-r--r--fs_mgr/fs_mgr_fstab.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index af4d6c1e1..a14dba3c6 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -679,7 +679,6 @@ static struct fstab *in_place_merge(struct fstab *a, struct fstab *b)
// We can't call fs_mgr_free_fstab because a->recs still references the
// memory allocated by strdup.
free(b->recs);
- free(b->fstab_filename);
free(b);
a->num_entries = total_entries;
@@ -741,9 +740,7 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path)
}
fstab = fs_mgr_read_fstab_file(fstab_file);
- if (fstab) {
- fstab->fstab_filename = strdup(fstab_path);
- } else {
+ if (!fstab) {
LERROR << __FUNCTION__ << "(): failed to load fstab from : '" << fstab_path << "'";
}
@@ -854,9 +851,6 @@ void fs_mgr_free_fstab(struct fstab *fstab)
/* Free the fstab_recs array created by calloc(3) */
free(fstab->recs);
- /* Free the fstab filename */
- free(fstab->fstab_filename);
-
/* Free fstab */
free(fstab);
}