aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2016-05-27 19:30:13 +0000
committerEnji Cooper <ngie@FreeBSD.org>2016-05-27 19:30:13 +0000
commit65d4c609a4ccb226614485ccc2bc73f9e0d1366c (patch)
tree31637a4330762d57d706e0586d244bb5eab5391d
parent9c8f0619db3a8863d952c422ae3791f4a29a35b7 (diff)
downloadsrc-65d4c609a4ccb226614485ccc2bc73f9e0d1366c.tar.gz
src-65d4c609a4ccb226614485ccc2bc73f9e0d1366c.zip
Only expose `hint_uaddr` in the ND_DEBUG case
This fixes a -Wunused-but-set-variable warning with gcc MFC after: 1 week Reported by: gcc 5 Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=300867
-rw-r--r--usr.sbin/rpcbind/util.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index da6a5abeea75..25adcfcd1f17 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -119,7 +119,9 @@ addrmerge(struct netbuf *caller, const char *serv_uaddr, const char *clnt_uaddr,
struct sockaddr_storage ss;
struct netconfig *nconf;
char *caller_uaddr = NULL;
+#ifdef ND_DEBUG
const char *hint_uaddr = NULL;
+#endif
char *ret = NULL;
int bestif_goodness;
@@ -140,13 +142,17 @@ addrmerge(struct netbuf *caller, const char *serv_uaddr, const char *clnt_uaddr,
*/
hint_sa = NULL;
if (clnt_uaddr != NULL) {
+#ifdef ND_DEBUG
hint_uaddr = clnt_uaddr;
+#endif
if ((hint_nbp = uaddr2taddr(nconf, clnt_uaddr)) == NULL)
goto freeit;
hint_sa = hint_nbp->buf;
}
if (hint_sa == NULL || hint_sa->sa_family != caller_sa->sa_family) {
+#ifdef ND_DEBUG
hint_uaddr = caller_uaddr;
+#endif
hint_sa = caller->buf;
}