From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sun, 17 Sep 2006 15:09:48 +0000 (-0000)
Subject: mount: mount_it_now() - char *dir is not really needed.
X-Git-Tag: 1_4_0~671
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a52145a9270f6cef5eb1e048283ce46fc6e67a4b;p=oweals%2Fbusybox.git

mount: mount_it_now() - char *dir is not really needed.
---

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 430ec9bac..8ebf626cb 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);
 		}
 	}