From: Steve Dickson <steved@redhat.com>
Date: Sat, 5 Mar 2011 21:13:01 +0000 (-0500)
Subject: mount: Remove MOUNT_CONFIG warnings
X-Git-Tag: nfs-utils-1-2-4-rc6~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=930323817b61877d61fb8ef57229013daa2e6091;p=nfs-utils.git

mount: Remove MOUNT_CONFIG warnings

The following changes are needed to remove compile warnings when
MOUNT_CONFIG is not defined

Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/mount/mount_config.h b/utils/mount/mount_config.h
index e86b4ba..69ffd1e 100644
--- a/utils/mount/mount_config.h
+++ b/utils/mount/mount_config.h
@@ -39,10 +39,10 @@ static inline char *mount_config_opts(char *spec,
 
 #else /* MOUNT_CONFIG */
 
-static inline void mount_config_init(char *program) { }
+static inline void mount_config_init(__attribute__ ((unused)) char *program) { }
 
-static inline char *mount_config_opts(char *spec,
-		char *mount_point, char *mount_opts)
+static inline char *mount_config_opts(__attribute__ ((unused)) char *spec,
+		__attribute__ ((unused)) char *mount_point, char *mount_opts)
 {
 	return mount_opts;
 }
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index e314b82..f1aa503 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -110,7 +110,7 @@ static void nfs_default_version(struct nfsmount_info *mi)
 	}
 }
 #else
-inline void nfs_default_version(struct nfsmount_info *mi) {}
+inline void nfs_default_version(__attribute__ ((unused)) struct nfsmount_info *mi) {}
 #endif /* MOUNT_CONFIG */
 
 /*