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, 7 insertions, 6 deletions

diff --git a/sys/netinet/libalias/alias_cuseeme.c b/sys/netinet/libalias/alias_cuseeme.c
index 4b0f5a5..bca6b3b 100644
--- a/sys/netinet/libalias/alias_cuseeme.c
+++ b/sys/netinet/libalias/alias_cuseeme.c
@@ -68,25 +68,25 @@ struct client_info {
 };
 
 void
-AliasHandleCUSeeMeOut(struct libalias *la, struct ip *pip, struct alias_link *link)
+AliasHandleCUSeeMeOut(struct libalias *la, struct ip *pip, struct alias_link *lnk)
 {
 	struct udphdr *ud;
 
 	ud = (struct udphdr *)((char *)pip + (pip->ip_hl << 2));
 	if (ntohs(ud->uh_ulen) - sizeof(struct udphdr) >= sizeof(struct cu_header)) {
 		struct cu_header *cu;
-		struct alias_link *cu_link;
+		struct alias_link *cu_lnk;
 
 		cu = (struct cu_header *)(ud + 1);
 		if (cu->addr)
-			cu->addr = (u_int32_t) GetAliasAddress(link).s_addr;
+			cu->addr = (u_int32_t) GetAliasAddress(lnk).s_addr;
 
-		cu_link = FindUdpTcpOut(la, pip->ip_src, GetDestAddress(link),
+		cu_lnk = FindUdpTcpOut(la, pip->ip_src, GetDestAddress(lnk),
 		    ud->uh_dport, 0, IPPROTO_UDP, 1);
 
 #ifndef NO_FW_PUNCH
-		if (cu_link)
-			PunchFWHole(cu_link);
+		if (cu_lnk)
+			PunchFWHole(cu_lnk);
 #endif
 	}
 }
@@ -102,6 +102,7 @@ AliasHandleCUSeeMeIn(struct libalias *la, struct ip *pip, struct in_addr origina
 	char *end;
 	int i;
 
+	(void)la;
 	alias_addr.s_addr = pip->ip_dst.s_addr;
 	ud = (struct udphdr *)((char *)pip + (pip->ip_hl << 2));
 	cu = (struct cu_header *)(ud + 1);