svn commit: trunk/busybox/util-linux

[landley at busybox.net]

Author: landley
Date: 2006-08-08 05:54:02 -0700 (Tue, 08 Aug 2006)
New Revision: 15790

Log:
Fix a typo (|| instead of |) and remove two comments about a problem fixed
in the previous patch.


Modified:
   trunk/busybox/util-linux/mount.c


Changeset:
Modified: trunk/busybox/util-linux/mount.c
===================================================================
--- trunk/busybox/util-linux/mount.c	2006-08-08 01:39:49 UTC (rev 15789)
+++ trunk/busybox/util-linux/mount.c	2006-08-08 12:54:02 UTC (rev 15790)
@@ -233,7 +233,6 @@
 
 		for(i=0; mount_options[i].flags != MS_REMOUNT; i++)
 			if (mount_options[i].flags > 0)
-// Shut up about the darn const.  It's not important.  I don't care.  (char *)
 				append_mount_options(&(mp->mnt_opts), mount_options[i].name);
 
 		// Remove trailing / (if any) from directory we mounted on
@@ -292,7 +291,7 @@
 	// Look at the file.  (Not found isn't a failure for remount, or for
 	// a synthetic filesystem like proc or sysfs.)
 
-	if (!lstat(mp->mnt_fsname, &st) && !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE | MS_SHARED | MS_PRIVATE || MS_SLAVE | MS_UNBINDABLE)))
+	if (!lstat(mp->mnt_fsname, &st) && !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE | MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)))
 	{
 		// Do we need to allocate a loopback device for it?
 
@@ -463,7 +462,7 @@
 	// Open either fstab or mtab
 
 	if (parse_mount_options(cmdopts,0) & MS_REMOUNT)
-		fstabname = bb_path_mtab_file;  // Again with the evil const (char *).
+		fstabname = bb_path_mtab_file;
 	else fstabname="/etc/fstab";
 
 	if (!(fstab=setmntent(fstabname,"r")))