svn commit: trunk/busybox/util-linux

[vda at busybox.net]

Author: vda
Date: 2008-03-17 18:44:52 -0700 (Mon, 17 Mar 2008)
New Revision: 21378

Log:
mount: #ifdef out MOUNT_LABEL code parts if it is not selected



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


Changeset:
Modified: trunk/busybox/util-linux/mount.c
===================================================================
--- trunk/busybox/util-linux/mount.c	2008-03-18 01:38:04 UTC (rev 21377)
+++ trunk/busybox/util-linux/mount.c	2008-03-18 01:44:52 UTC (rev 21378)
@@ -22,8 +22,10 @@
 #include <syslog.h>
 #include "libbb.h"
 
+#if ENABLE_FEATURE_MOUNT_LABEL
 /* For FEATURE_MOUNT_LABEL only */
 #include "volume_id.h"
+#endif
 
 /* Needed for nfs support only */
 #include <sys/utsname.h>
@@ -252,10 +254,12 @@
 {
 	char *tmp = NULL;
 
+#if ENABLE_FEATURE_MOUNT_LABEL
 	if (!strncmp(*fsname, "UUID=", 5))
 		tmp = get_devname_from_uuid(*fsname + 5);
 	else if (!strncmp(*fsname, "LABEL=", 6))
 		tmp = get_devname_from_label(*fsname + 6);
+#endif
 
 	if (tmp) {
 		*fsname = tmp;