summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenis Vlasenko2006-09-17 15:09:48 +0000
committerDenis Vlasenko2006-09-17 15:09:48 +0000
commita52145a9270f6cef5eb1e048283ce46fc6e67a4b (patch)
treee0066a08a00f4210e65b5458e4ae312bec52eb7d /util-linux
parentc889d2b786e8bd3e6e79ed4e03de5d04d3b4b196 (diff)
downloadbusybox-a52145a9270f6cef5eb1e048283ce46fc6e67a4b.zip
busybox-a52145a9270f6cef5eb1e048283ce46fc6e67a4b.tar.gz
mount: mount_it_now() - char *dir is not really needed.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mount.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 430ec9b..8ebf626 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -253,7 +253,7 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
* mtab file by hand, add the new entry to it now. */
if (ENABLE_FEATURE_MTAB_SUPPORT && useMtab && !rc && !(vfsflags & MS_REMOUNT)) {
- char *dir,*fsname;
+ char *fsname;
FILE *mountTable = setmntent(bb_path_mtab_file, "a+");
int i;
@@ -273,7 +273,7 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
// Convert to canonical pathnames as needed
- mp->mnt_dir = dir = bb_simplify_path(mp->mnt_dir);
+ mp->mnt_dir = bb_simplify_path(mp->mnt_dir);
fsname = 0;
if (!mp->mnt_type || !*mp->mnt_type) { /* bind mount */
mp->mnt_fsname = fsname = bb_simplify_path(mp->mnt_fsname);
@@ -286,7 +286,7 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
addmntent(mountTable, mp);
endmntent(mountTable);
if (ENABLE_FEATURE_CLEAN_UP) {
- free(dir);
+ free(mp->mnt_dir);
free(fsname);
}
}