From: Steve Dickson <steved@redhat.com>
To: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 21/24] Removed warnings from network.c
Date: Tue, 20 Jul 2010 19:37:34 -0400 [thread overview]
Message-ID: <1279669057-17509-22-git-send-email-steved@redhat.com> (raw)
In-Reply-To: <1279669057-17509-1-git-send-email-steved@redhat.com>
network.c: In function 'nfs_verify_family':
network.c:1366: warning: unused parameter 'family'
Signed-off-by: Steve Dickson <steved@redhat.com>
---
utils/mount/network.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/utils/mount/network.c b/utils/mount/network.c
index ffb18ab..8d48ce0 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -1362,11 +1362,6 @@ nfs_nfs_port(struct mount_options *options, unsigned long *port)
#ifdef IPV6_SUPPORTED
sa_family_t config_default_family = AF_UNSPEC;
-static int
-nfs_verify_family(sa_family_t family)
-{
- return 1;
-}
#else /* IPV6_SUPPORTED */
sa_family_t config_default_family = AF_INET;
@@ -1410,13 +1405,15 @@ int nfs_nfs_proto_family(struct mount_options *options,
}
}
- if (!nfs_verify_family(tmp_family))
- goto out_err;
+#ifndef IPV6_SUPPORTED
+ if (!nfs_verify_family(tmp_family)) {
+ errno = EAFNOSUPPORT;
+ return 0;
+ }
+#endif
+
*family = tmp_family;
return 1;
-out_err:
- errno = EAFNOSUPPORT;
- return 0;
}
/*
@@ -1566,8 +1563,10 @@ int nfs_mount_proto_family(struct mount_options *options,
errno = EPROTONOSUPPORT;
goto out_err;
}
+#ifndef IPV6_SUPPORTED
if (!nfs_verify_family(tmp_family))
goto out_err;
+#endif
*family = tmp_family;
return 1;
}
--
1.7.0.1
next prev parent reply other threads:[~2010-07-21 0:43 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-20 23:37 [PATCH 00/24] Turn on the -Wextra compile flag Steve Dickson
2010-07-20 23:37 ` [PATCH 01/24] Enable extra compile warnings (-Wextra) by default Steve Dickson
2010-07-20 23:37 ` [PATCH 02/24] Remove warnings from nfsctl.c Steve Dickson
2010-07-21 17:06 ` J. Bruce Fields
2010-08-04 12:36 ` Steve Dickson
2010-07-20 23:37 ` [PATCH 03/24] Removed warnings from rpcdispatch.c Steve Dickson
2010-07-20 23:37 ` [PATCH 04/24] Remove warnings from svc_socket.c Steve Dickson
2010-07-20 23:37 ` [PATCH 05/24] emove warnings from cacheio.c Steve Dickson
2010-07-20 23:37 ` [PATCH 06/24] Remove warnings from nfs_mntent.c Steve Dickson
2010-07-20 23:37 ` [PATCH 07/24] Removed warnings from conffile.c Steve Dickson
2010-07-20 23:37 ` [PATCH 08/24] Removed warnings from mountd.c Steve Dickson
2010-07-21 17:12 ` J. Bruce Fields
2010-08-04 13:44 ` Steve Dickson
2010-07-21 17:23 ` Chuck Lever
2010-08-04 13:50 ` Steve Dickson
2010-08-04 15:57 ` Chuck Lever
2010-07-20 23:37 ` [PATCH 09/24] Removed warnings from fsloc.c Steve Dickson
2010-07-20 23:37 ` [PATCH 10/24] Removed warnings from cache.c Steve Dickson
2010-07-20 23:37 ` [PATCH 11/24] Removed warnings from nfssvc.c Steve Dickson
2010-07-20 23:37 ` [PATCH 12/24] Removed warnings from nfsstat.c Steve Dickson
2010-07-20 23:37 ` [PATCH 13/24] Removed warnings from atomicio.c Steve Dickson
2010-07-20 23:37 ` [PATCH 14/24] Removed warnings from idmapd.c Steve Dickson
2010-07-21 17:24 ` J. Bruce Fields
2010-07-20 23:37 ` [PATCH 15/24] Removed warnings from gssd.c Steve Dickson
2010-07-20 23:37 ` [PATCH 16/24] Removed warnings from gssd_main_loop.c Steve Dickson
2010-07-20 23:37 ` [PATCH 17/24] Removed warnings from krb5_util.c Steve Dickson
2010-07-20 23:37 ` [PATCH 18/24] Removed warnings from gssd_proc.c Steve Dickson
2010-07-20 23:37 ` [PATCH 19/24] Removed warnings from svcgssd.c Steve Dickson
2010-07-20 23:37 ` [PATCH 20/24] Removed warnings from svcgssd_proc.c Steve Dickson
2010-07-21 17:23 ` J. Bruce Fields
2010-07-20 23:37 ` Steve Dickson [this message]
2010-07-21 17:17 ` [PATCH 21/24] Removed warnings from network.c Chuck Lever
2010-07-20 23:37 ` [PATCH 22/24] Removed warnings from nfsmount.c Steve Dickson
2010-07-20 23:37 ` [PATCH 23/24] Removed warnings from nfs4mount.c Steve Dickson
2010-07-20 23:37 ` [PATCH 24/24] Removed warnings from configfile.c Steve Dickson
2010-07-21 17:53 ` Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279669057-17509-22-git-send-email-steved@redhat.com \
--to=steved@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).