diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-17 15:09:48 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-17 15:09:48 +0000 |
commit | a52145a9270f6cef5eb1e048283ce46fc6e67a4b (patch) | |
tree | e0066a08a00f4210e65b5458e4ae312bec52eb7d /util-linux/mount.c | |
parent | c889d2b786e8bd3e6e79ed4e03de5d04d3b4b196 (diff) | |
download | busybox-w32-a52145a9270f6cef5eb1e048283ce46fc6e67a4b.tar.gz busybox-w32-a52145a9270f6cef5eb1e048283ce46fc6e67a4b.tar.bz2 busybox-w32-a52145a9270f6cef5eb1e048283ce46fc6e67a4b.zip |
mount: mount_it_now() - char *dir is not really needed.
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r-- | util-linux/mount.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
253 | * mtab file by hand, add the new entry to it now. */ | 253 | * mtab file by hand, add the new entry to it now. */ |
254 | 254 | ||
255 | if (ENABLE_FEATURE_MTAB_SUPPORT && useMtab && !rc && !(vfsflags & MS_REMOUNT)) { | 255 | if (ENABLE_FEATURE_MTAB_SUPPORT && useMtab && !rc && !(vfsflags & MS_REMOUNT)) { |
256 | char *dir,*fsname; | 256 | char *fsname; |
257 | FILE *mountTable = setmntent(bb_path_mtab_file, "a+"); | 257 | FILE *mountTable = setmntent(bb_path_mtab_file, "a+"); |
258 | int i; | 258 | int i; |
259 | 259 | ||
@@ -273,7 +273,7 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts) | |||
273 | 273 | ||
274 | // Convert to canonical pathnames as needed | 274 | // Convert to canonical pathnames as needed |
275 | 275 | ||
276 | mp->mnt_dir = dir = bb_simplify_path(mp->mnt_dir); | 276 | mp->mnt_dir = bb_simplify_path(mp->mnt_dir); |
277 | fsname = 0; | 277 | fsname = 0; |
278 | if (!mp->mnt_type || !*mp->mnt_type) { /* bind mount */ | 278 | if (!mp->mnt_type || !*mp->mnt_type) { /* bind mount */ |
279 | mp->mnt_fsname = fsname = bb_simplify_path(mp->mnt_fsname); | 279 | 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) | |||
286 | addmntent(mountTable, mp); | 286 | addmntent(mountTable, mp); |
287 | endmntent(mountTable); | 287 | endmntent(mountTable); |
288 | if (ENABLE_FEATURE_CLEAN_UP) { | 288 | if (ENABLE_FEATURE_CLEAN_UP) { |
289 | free(dir); | 289 | free(mp->mnt_dir); |
290 | free(fsname); | 290 | free(fsname); |
291 | } | 291 | } |
292 | } | 292 | } |