Make libalias WARNS?=6-clean. This mostly involves renaming variables

named link, foo_link or link_foo to lnk, foo_lnk or lnk_foo, fixing
signed / unsigned comparisons, and shoving unused function arguments
under the carpet.

I was hoping WARNS?=6 might reveal more serious problems, and perhaps
the source of the -O2 breakage, but found no smoking gun.

1 files changed, 16 insertions, 2 deletions

diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index fc5fa84..151bc9d 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -204,7 +204,7 @@ int
 AliasHandleUdpNbt(
     struct libalias *la,
     struct ip *pip,		/* IP packet to examine/patch */
-    struct alias_link *link,
+    struct alias_link *lnk,
     struct in_addr *alias_address,
     u_short alias_port
 )
@@ -214,6 +214,9 @@ AliasHandleUdpNbt(
 	u_char *p = NULL;
 	char *pmax;
 
+	(void)la;
+	(void)lnk;
+
 	/* Calculate data length of UDP packet */
 	uh = (struct udphdr *)((char *)pip + (pip->ip_hl << 2));
 	pmax = (char *)uh + ntohs(uh->uh_ulen);
@@ -288,6 +291,8 @@ AliasHandleQuestion(
     NBTArguments * nbtarg)
 {
 
+	(void)nbtarg;
+
 	while (count != 0) {
 		/* Name Filed */
 		q = (NBTNsQuestion *) AliasHandleName((u_char *) q, pmax);
@@ -468,6 +473,8 @@ AliasHandleResourceNULL(
 	NBTNsResourceNULL *n;
 	u_short bcount;
 
+	(void)nbtarg;
+
 	if (q == NULL || (char *)(q + 1) > pmax)
 		return (NULL);
 
@@ -501,6 +508,8 @@ AliasHandleResourceNS(
 	NBTNsResourceNULL *n;
 	u_short bcount;
 
+	(void)nbtarg;
+
 	if (q == NULL || (char *)(q + 1) > pmax)
 		return (NULL);
 
@@ -532,6 +541,8 @@ AliasHandleResourceNBSTAT(
 	NBTNsResourceNBSTAT *n;
 	u_short bcount;
 
+	(void)nbtarg;
+
 	if (q == NULL || (char *)(q + 1) > pmax)
 		return (NULL);
 
@@ -621,7 +632,7 @@ int
 AliasHandleUdpNbtNS(
     struct libalias *la,
     struct ip *pip,		/* IP packet to examine/patch */
-    struct alias_link *link,
+    struct alias_link *lnk,
     struct in_addr *alias_address,
     u_short * alias_port,
     struct in_addr *original_address,
@@ -633,6 +644,9 @@ AliasHandleUdpNbtNS(
 	char *pmax;
 	NBTArguments nbtarg;
 
+	(void)la;
+	(void)lnk;
+
 	/* Set up Common Parameter */
 	nbtarg.oldaddr = *alias_address;
 	nbtarg.oldport = *alias_port;