From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Tue, 18 Mar 2008 01:44:52 +0000 (-0000)
Subject: mount: #ifdef out MOUNT_LABEL code parts if it is not selected
X-Git-Tag: 1_10_0~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6aa7696e280181cd87f7569ce65696b760dca891;p=oweals%2Fbusybox.git

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

diff --git a/util-linux/mount.c b/util-linux/mount.c
index d4a320756..bd5f27b2e 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -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 @@ static int resolve_mount_spec(char **fsname)
 {
 	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;