warnings: remove variable shadowing

This fixes multiple instances of variable shadowing warning, that look like:
warning: declaration of 'var' shadows a previous local [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

8 files changed, 126 insertions, 123 deletions

diff --git a/arping.c b/arping.c
index 43a2fcf..8c08dd3 100644
--- a/arping.c
+++ b/arping.c
@@ -79,14 +79,14 @@ struct device device = {
 	.name = DEFAULT_DEVICE,
 };
 char *source;
-struct in_addr src, dst;
+struct in_addr gsrc, gdst;
 char *target;
 int dad, unsolicited, advert;
 int quiet;
 int count=-1;
 int timeout;
 int unicasting;
-int s;
+int socketfd;
 int broadcast_only;
 
 struct sockaddr_storage me;
@@ -376,7 +376,7 @@ void catcher(void)
 	if (last.tv_sec==0 || timespec_later(&ts_s, &ts_o)) {
 		if (!timeout && (sent == count))
 			finish();
-		send_pack(s, src, dst,
+		send_pack(socketfd, gsrc, gdst,
 			  (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he);
 		if ((sent == count) && unsolicited)
 			/* We usually wait for an extra iteration
@@ -398,7 +398,8 @@ void print_hex(unsigned char *p, int len)
 	}
 }
 
-int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
+int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM,
+	      struct in_addr src, struct in_addr dst)
 {
 	struct timespec ts;
 	struct arphdr *ah = (struct arphdr*)buf;
@@ -746,7 +747,7 @@ int find_device_by_sysfs(void)
 
 	while ((dirp = readdir(dir)) != NULL) {
 		int i;
-		int rc = -1;
+		int ret = -1;
 
 		if (!strcmp(dirp->d_name, ".") || !strcmp(dirp->d_name, ".."))
 			continue;
@@ -767,13 +768,13 @@ int find_device_by_sysfs(void)
 			if (fscanf(f, "%255s", str) != 1)
 				str[0] = '\0';
 			fclose(f);
-			rc = sysfs_devattrs[i].handler(str, &sysfs_devattr_values, i);
+			ret = sysfs_devattrs[i].handler(str, &sysfs_devattr_values, i);
 
-			if (rc < 0)
+			if (ret < 0)
 				break;
 		}
 
-		if (rc < 0)
+		if (ret < 0)
 			goto do_next;
 
 		if (check_ifflags(sysfs_devattr_values.value[SYSFS_DEVATTR_FLAGS].ulong,
@@ -929,16 +930,18 @@ out:
  * This fills the device "broadcast address"
  * based on information found by find_device() funcion.
  */
-static int set_device_broadcast_ifaddrs_one(struct device *device, unsigned char *ba, size_t balen, int fatal)
+static int set_device_broadcast_ifaddrs_one(struct device *dev,
+					    unsigned char *ba, size_t balen,
+					    int fatal)
 {
 #ifndef WITHOUT_IFADDRS
 	struct ifaddrs *ifa;
 	struct sockaddr_ll *sll;
 
-	if (!device)
+	if (!dev)
 		return -1;
 
-	ifa = device->ifa;
+	ifa = dev->ifa;
 	if (!ifa)
 		return -1;
 
@@ -958,13 +961,13 @@ static int set_device_broadcast_ifaddrs_one(struct device *device, unsigned char
 	return -1;
 #endif
 }
-int set_device_broadcast_sysfs(struct device *device, unsigned char *ba, size_t balen)
+int set_device_broadcast_sysfs(struct device *dev, unsigned char *ba, size_t balen)
 {
 #ifdef USE_SYSFS
 	struct sysfs_devattr_values *v;
-	if (!device)
+	if (!dev)
 		return -1;
-	v = device->sysfs;
+	v = dev->sysfs;
 	if (!v)
 		return -1;
 	if (v->value[SYSFS_DEVATTR_ADDR_LEN].ulong != balen)
@@ -976,7 +979,7 @@ int set_device_broadcast_sysfs(struct device *device, unsigned char *ba, size_t
 #endif
 }
 
-static int set_device_broadcast_fallback(struct device *device, unsigned char *ba, size_t balen)
+static int set_device_broadcast_fallback(unsigned char *ba, size_t balen)
 {
 	if (!quiet)
 		fprintf(stderr, "WARNING: using default broadcast address.\n");
@@ -990,7 +993,7 @@ static void set_device_broadcast(struct device *dev, unsigned char *ba, size_t b
 		return;
 	if (!set_device_broadcast_sysfs(dev, ba, balen))
 		return;
-	set_device_broadcast_fallback(dev, ba, balen);
+	set_device_broadcast_fallback(ba, balen);
 }
 
 int
@@ -1007,7 +1010,7 @@ main(int argc, char **argv)
 
 	enable_capability_raw();
 
-	s = socket(PF_PACKET, SOCK_DGRAM, 0);
+	socketfd = socket(PF_PACKET, SOCK_DGRAM, 0);
 	socket_errno = errno;
 
 	disable_capability_raw();
@@ -1066,7 +1069,7 @@ main(int argc, char **argv)
 	if (device.name && !*device.name)
 		device.name = NULL;
 
-	if (s < 0) {
+	if (socketfd < 0) {
 		errno = socket_errno;
 		perror("arping: socket");
 		exit(2);
@@ -1084,7 +1087,7 @@ main(int argc, char **argv)
 		usage();
 	}
 
-	if (inet_aton(target, &dst) != 1) {
+	if (inet_aton(target, &gdst) != 1) {
 		struct addrinfo hints = {
 			.ai_family = AF_INET,
 			.ai_socktype = SOCK_RAW,
@@ -1101,19 +1104,19 @@ main(int argc, char **argv)
 			exit(2);
 		}
 
-		memcpy(&dst, &((struct sockaddr_in *) result->ai_addr)->sin_addr, sizeof dst);
+		memcpy(&gdst, &((struct sockaddr_in *) result->ai_addr)->sin_addr, sizeof gdst);
 		freeaddrinfo(result);
 	}
 
-	if (source && inet_aton(source, &src) != 1) {
+	if (source && inet_aton(source, &gsrc) != 1) {
 		fprintf(stderr, "arping: invalid source %s\n", source);
 		exit(2);
 	}
 
-	if (!dad && unsolicited && src.s_addr == 0)
-		src = dst;
+	if (!dad && unsolicited && gsrc.s_addr == 0)
+		gsrc = gdst;
 
-	if (!dad || src.s_addr) {
+	if (!dad || gsrc.s_addr) {
 		struct sockaddr_in saddr;
 		int probe_fd = socket(AF_INET, SOCK_DGRAM, 0);
 
@@ -1131,8 +1134,8 @@ main(int argc, char **argv)
 		}
 		memset(&saddr, 0, sizeof(saddr));
 		saddr.sin_family = AF_INET;
-		if (src.s_addr) {
-			saddr.sin_addr = src;
+		if (gsrc.s_addr) {
+			saddr.sin_addr = gsrc;
 			if (bind(probe_fd, (struct sockaddr*)&saddr, sizeof(saddr)) == -1) {
 				perror("bind");
 				exit(2);
@@ -1142,7 +1145,7 @@ main(int argc, char **argv)
 			socklen_t alen = sizeof(saddr);
 
 			saddr.sin_port = htons(1025);
-			saddr.sin_addr = dst;
+			saddr.sin_addr = gdst;
 
 			if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char*)&on, sizeof(on)) == -1)
 				perror("WARNING: setsockopt(SO_DONTROUTE)");
@@ -1154,7 +1157,7 @@ main(int argc, char **argv)
 				perror("getsockname");
 				exit(2);
 			}
-			src = saddr.sin_addr;
+			gsrc = saddr.sin_addr;
 		}
 		close(probe_fd);
 	};
@@ -1162,14 +1165,14 @@ main(int argc, char **argv)
 	((struct sockaddr_ll *)&me)->sll_family = AF_PACKET;
 	((struct sockaddr_ll *)&me)->sll_ifindex = device.ifindex;
 	((struct sockaddr_ll *)&me)->sll_protocol = htons(ETH_P_ARP);
-	if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) {
+	if (bind(socketfd, (struct sockaddr*)&me, sizeof(me)) == -1) {
 		perror("bind");
 		exit(2);
 	}
 
 	if (1) {
 		socklen_t alen = sizeof(me);
-		if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
+		if (getsockname(socketfd, (struct sockaddr*)&me, &alen) == -1) {
 			perror("getsockname");
 			exit(2);
 		}
@@ -1186,11 +1189,11 @@ main(int argc, char **argv)
 			     ((struct sockaddr_ll *)&he)->sll_halen);
 
 	if (!quiet) {
-		printf("ARPING %s ", inet_ntoa(dst));
-		printf("from %s %s\n",  inet_ntoa(src), device.name ? : "");
+		printf("ARPING %s ", inet_ntoa(gdst));
+		printf("from %s %s\n",  inet_ntoa(gsrc), device.name ? : "");
 	}
 
-	if (!src.s_addr && !dad) {
+	if (!gsrc.s_addr && !dad) {
 		fprintf(stderr, "arping: no source address in not-DAD mode\n");
 		exit(2);
 	}
@@ -1218,7 +1221,7 @@ main(int argc, char **argv)
 		 * is received. */
 		sigprocmask(SIG_UNBLOCK, &sset, &osset);
 
-		if ((cc = recvfrom(s, packet, sizeof(packet), 0,
+		if ((cc = recvfrom(socketfd, packet, sizeof(packet), 0,
 				   (struct sockaddr *)&from, &alen)) < 0) {
 			perror("arping: recvfrom");
 			if (errno == ENETDOWN)
@@ -1227,7 +1230,7 @@ main(int argc, char **argv)
 		}
 
 		sigprocmask(SIG_BLOCK, &sset, NULL);
-		recv_pack(packet, cc, (struct sockaddr_ll *)&from);
+		recv_pack(packet, cc, (struct sockaddr_ll *)&from, gsrc, gdst);
 		sigprocmask(SIG_SETMASK, &osset, NULL);
 	}
 }
diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c
index eb3a3ee..d1ccdfb 100644
--- a/ninfod/ninfod.c
+++ b/ninfod/ninfod.c
@@ -207,20 +207,20 @@ static int __inline__ open_sock(void)
 	return socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
 }
 
-static int set_recvpktinfo(int sock)
+static int set_recvpktinfo(int socket)
 {
 	int on, ret;
 
 	on = 1;
 
 #if defined(IPV6_RECVPKTINFO)
-	ret = setsockopt(sock,
+	ret = setsockopt(socket,
 			 IPPROTO_IPV6, IPV6_RECVPKTINFO,
 			 &on, sizeof(on));
 	if (!ret)
 		return 0;
 # if defined(IPV6_2292PKTINFO)
-	ret = setsockopt(sock,
+	ret = setsockopt(socket,
 			 IPPROTO_IPV6, IPV6_2292PKTINFO,
 			 &on, sizeof(on));
 	if (!ret) {
@@ -235,7 +235,7 @@ static int set_recvpktinfo(int sock)
 	      strerror(errno));
 # endif
 #else
-	ret = setsockopt(sock,
+	ret = setsockopt(socket,
 			 IPPROTO_IPV6, IPV6_PKTINFO,
 			 &on, sizeof(on));
 	if (!ret)
@@ -248,14 +248,14 @@ static int set_recvpktinfo(int sock)
 	return -1;
 }
 
-static int __inline__ init_sock(int sock)
+static int __inline__ init_sock(int socket)
 {
 	struct icmp6_filter filter;
 #if NEED_IPV6CHECKSUM
 	int i;
 
 	i = offsetof(struct icmp6_nodeinfo, ni_cksum);
-	if (setsockopt(sock,
+	if (setsockopt(socket,
 		       IPPROTO_IPV6, IPV6_CHECKSUM,
 		       &i, sizeof(i)) < 0) {
 		DEBUG(LOG_ERR, "setsockopt(IPV6_CHECKSUM): %s\n",
@@ -266,7 +266,7 @@ static int __inline__ init_sock(int sock)
 
 	ICMP6_FILTER_SETBLOCKALL(&filter);
 	ICMP6_FILTER_SETPASS(ICMP6_NI_QUERY, &filter);
-	if (setsockopt(sock,
+	if (setsockopt(socket,
 		       IPPROTO_ICMPV6, ICMP6_FILTER,
 		       &filter, sizeof(filter)) < 0) {
 		DEBUG(LOG_ERR, "setsockopt(ICMP6_FILTER): %s\n",
@@ -274,7 +274,7 @@ static int __inline__ init_sock(int sock)
 		return -1;
 	}
 
-	if (set_recvpktinfo(sock) < 0)
+	if (set_recvpktinfo(socket) < 0)
 		return -1;
 
 	return 0;
@@ -283,7 +283,7 @@ static int __inline__ init_sock(int sock)
 /* --------- */
 int ni_recv(struct packetcontext *p)
 {
-	int sock = p->sock;
+	int socket = p->sock;
 	struct iovec iov[1];
 	struct msghdr msgh;
 	char recvcbuf[CMSG_SPACE(sizeof(p->pktinfo))];
@@ -304,7 +304,7 @@ int ni_recv(struct packetcontext *p)
 	msgh.msg_control = recvcbuf;
 	msgh.msg_controllen = sizeof(recvcbuf);
 
-	if ((cc = recvmsg(sock, &msgh, 0)) < 0)
+	if ((cc = recvmsg(socket, &msgh, 0)) < 0)
 		return -1;
 
 	p->querylen = cc;
@@ -328,7 +328,7 @@ int ni_recv(struct packetcontext *p)
 
 int ni_send(struct packetcontext *p)
 {
-	int sock = p->sock;
+	int socket = p->sock;
 	struct iovec iov[2];
 	char cbuf[CMSG_SPACE(sizeof(p->pktinfo))];
 	struct msghdr msgh;
@@ -377,7 +377,7 @@ int ni_send(struct packetcontext *p)
 #endif
 	}
 
-	cc = sendmsg(sock, &msgh, 0);
+	cc = sendmsg(socket, &msgh, 0);
 	if (cc < 0)
 		DEBUG(LOG_DEBUG, "sendmsg(): %s\n", strerror(errno));
 
diff --git a/ninfod/ninfod.h b/ninfod/ninfod.h
index feda4fa..6c88f13 100644
--- a/ninfod/ninfod.h
+++ b/ninfod/ninfod.h
@@ -102,9 +102,9 @@ void stderrlog(int priority, char *format, ...);
 
 #define ni_malloc(size)	({										\
 				size_t _size = (size);							\
-				void *p = malloc(_size);						\
-				DEBUG(LOG_DEBUG, "%s(): malloc(%zu) = %p\n", __func__, _size, p);	\
-				p;									\
+				void *ptr = malloc(_size);						\
+				DEBUG(LOG_DEBUG, "%s(): malloc(%zu) = %p\n", __func__, _size, ptr);	\
+				ptr;									\
 			})
 #define ni_free(p)	({										\
 				void *_p = (p);								\
diff --git a/ninfod/ninfod_name.c b/ninfod/ninfod_name.c
index 30dff58..4fdb6e4 100644
--- a/ninfod/ninfod_name.c
+++ b/ninfod/ninfod_name.c
@@ -260,12 +260,12 @@ static int compare_dnsname(const char *s, size_t slen,
 }
 
 static int nodeinfo_group(const char *dnsname, int namelen, 
-			  struct in6_addr *nigroup)
+			  struct in6_addr *nigrp)
 {
 	MD5_CTX ctxt;
 	unsigned char digest[16];
 
-	if (!dnsname || !nigroup)
+	if (!dnsname || !nigrp)
 		return -1;
 
 	MD5_Init(&ctxt);
@@ -273,16 +273,16 @@ static int nodeinfo_group(const char *dnsname, int namelen,
 	MD5_Final(digest, &ctxt);
 
 #ifdef s6_addr32
-	nigroup->s6_addr32[0] = htonl(0xff020000);
-	nigroup->s6_addr32[1] = 0;
-	nigroup->s6_addr32[2] = htonl(0x00000002);
+	nigrp->s6_addr32[0] = htonl(0xff020000);
+	nigrp->s6_addr32[1] = 0;
+	nigrp->s6_addr32[2] = htonl(0x00000002);
 #else
-	memset(nigroup, 0, sizeof(*nigroup));
-	nigroup->s6_addr[ 0] = 0xff;
-	nigroup->s6_addr[ 1] = 0x02;
-	nigroup->s6_addr[11] = 0x02;
+	memset(nigrp, 0, sizeof(*nigrp));
+	nigrp->s6_addr[ 0] = 0xff;
+	nigrp->s6_addr[ 1] = 0x02;
+	nigrp->s6_addr[11] = 0x02;
 #endif
-	memcpy(&nigroup->s6_addr[12], digest, 4);
+	memcpy(&nigrp->s6_addr[12], digest, 4);
 
 	return 0;
 }
diff --git a/ping.c b/ping.c
index 8c80405..1023770 100644
--- a/ping.c
+++ b/ping.c
@@ -181,12 +181,12 @@ static void create_socket(socket_st *sock, int family, int socktype, int protoco
 		sock->socktype = socktype;
 }
 
-static void set_socket_option(socket_st *sock, int level, int optname, const void *optval, socklen_t optlen)
+static void set_socket_option(socket_st *sock, int level, int optname, const void *optval, socklen_t olen)
 {
 	if (sock->fd == -1)
 		return;
 
-	if (setsockopt(sock->fd, level, optname, optval, optlen) == -1) {
+	if (setsockopt(sock->fd, level, optname, optval, olen) == -1) {
 		fprintf(stderr, "ping: setsockopt: %s\n", strerror(errno));
 		exit(2);
 	}
@@ -890,7 +890,7 @@ int ping4_receive_error_msg(socket_st *sock)
 	char cbuf[512];
 	struct iovec  iov;
 	struct msghdr msg;
-	struct cmsghdr *cmsg;
+	struct cmsghdr *cmsgh;
 	struct sock_extended_err *e;
 	struct icmphdr icmph;
 	struct sockaddr_in target;
@@ -913,10 +913,10 @@ int ping4_receive_error_msg(socket_st *sock)
 		goto out;
 
 	e = NULL;
-	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-		if (cmsg->cmsg_level == SOL_IP) {
-			if (cmsg->cmsg_type == IP_RECVERR)
-				e = (struct sock_extended_err *)CMSG_DATA(cmsg);
+	for (cmsgh = CMSG_FIRSTHDR(&msg); cmsgh; cmsgh = CMSG_NXTHDR(&msg, cmsgh)) {
+		if (cmsgh->cmsg_level == SOL_IP) {
+			if (cmsgh->cmsg_type == IP_RECVERR)
+				e = (struct sock_extended_err *)CMSG_DATA(cmsgh);
 		}
 	}
 	if (e == NULL)
@@ -1039,10 +1039,10 @@ ping4_parse_reply(struct socket_st *sock, struct msghdr *msg, int cc, void *addr
 	struct iphdr *ip;
 	int hlen;
 	int csfailed;
-	struct cmsghdr *cmsg;
-	int ttl;
+	struct cmsghdr *cmsgh;
+	int reply_ttl;
 	__u8 *opts, *tmp_ttl;
-	int optlen;
+	int olen;
 
 	/* Check the IP header */
 	ip = (struct iphdr *)buf;
@@ -1054,25 +1054,25 @@ ping4_parse_reply(struct socket_st *sock, struct msghdr *msg, int cc, void *addr
 					pr_addr(from, sizeof *from));
 			return 1;
 		}
-		ttl = ip->ttl;
+		reply_ttl = ip->ttl;
 		opts = buf + sizeof(struct iphdr);
-		optlen = hlen - sizeof(struct iphdr);
+		olen = hlen - sizeof(struct iphdr);
 	} else {
 		hlen = 0;
-		ttl = 0;
+		reply_ttl = 0;
 		opts = buf;
-		optlen = 0;
-		for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-			if (cmsg->cmsg_level != SOL_IP)
+		olen = 0;
+		for (cmsgh = CMSG_FIRSTHDR(msg); cmsgh; cmsgh = CMSG_NXTHDR(msg, cmsgh)) {
+			if (cmsgh->cmsg_level != SOL_IP)
 				continue;
-			if (cmsg->cmsg_type == IP_TTL) {
-				if (cmsg->cmsg_len < sizeof(int))
+			if (cmsgh->cmsg_type == IP_TTL) {
+				if (cmsgh->cmsg_len < sizeof(int))
 					continue;
-				tmp_ttl = (__u8 *) CMSG_DATA(cmsg);
-				ttl = (int)*tmp_ttl;
-			} else if (cmsg->cmsg_type == IP_RETOPTS) {
-				opts = (__u8 *) CMSG_DATA(cmsg);
-				optlen = cmsg->cmsg_len;
+				tmp_ttl = (__u8 *) CMSG_DATA(cmsgh);
+				reply_ttl = (int)*tmp_ttl;
+			} else if (cmsgh->cmsg_type == IP_RETOPTS) {
+				opts = (__u8 *) CMSG_DATA(cmsgh);
+				olen = cmsgh->cmsg_len;
 			}
 		}
 	}
@@ -1089,7 +1089,7 @@ ping4_parse_reply(struct socket_st *sock, struct msghdr *msg, int cc, void *addr
 			return 1;			/* 'Twas really not our ECHO */
 		if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
 				      ntohs(icp->un.echo.sequence),
-				      ttl, csfailed, tv, pr_addr(from, sizeof *from),
+				      reply_ttl, 0, tv, pr_addr(from, sizeof *from),
 				      pr_echo_reply)) {
 			fflush(stdout);
 			return 0;
@@ -1167,7 +1167,7 @@ ping4_parse_reply(struct socket_st *sock, struct msghdr *msg, int cc, void *addr
 			fflush(stdout);
 	}
 	if (!(options & F_FLOOD)) {
-		pr_options(opts, optlen + sizeof(struct iphdr));
+		pr_options(opts, olen + sizeof(struct iphdr));
 
 		putchar('\n');
 		fflush(stdout);
@@ -1373,7 +1373,7 @@ void pr_icmph(__u8 type, __u8 code, __u32 info, struct icmphdr *icp)
 void pr_options(unsigned char * cp, int hlen)
 {
 	int i, j;
-	int optlen, totlen;
+	int olen, totlen;
 	unsigned char * optptr;
 	static int old_rrlen;
 	static char old_rr[MAX_IPOPTLEN];
@@ -1391,8 +1391,8 @@ void pr_options(unsigned char * cp, int hlen)
 			continue;
 		}
 		cp = optptr;
-		optlen = optptr[1];
-		if (optlen < 2 || optlen > totlen)
+		olen = optptr[1];
+		if (olen < 2 || olen > totlen)
 			break;
 
 		switch (*cp) {
@@ -1518,8 +1518,8 @@ void pr_options(unsigned char * cp, int hlen)
 			printf("\nunknown option %x", *cp);
 			break;
 		}
-		totlen -= optlen;
-		optptr += optlen;
+		totlen -= olen;
+		optptr += olen;
 	}
 }
 
diff --git a/rarpd.c b/rarpd.c
index 2e5e22b..bf6ea0e 100644
--- a/rarpd.c
+++ b/rarpd.c
@@ -452,14 +452,14 @@ void serve_it(int fd)
 	if (verbose) {
 		int i;
 		char tmpbuf[16*3];
-		char *ptr = tmpbuf;
+		char *p = tmpbuf;
 		for (i=0; i<sll.sll_halen; i++) {
 			if (i) {
-				sprintf(ptr, ":%02x", sll.sll_addr[i]);
-				ptr++;
+				sprintf(p, ":%02x", sll.sll_addr[i]);
+				p++;
 			} else
-				sprintf(ptr, "%02x", sll.sll_addr[i]);
-			ptr += 2;
+				sprintf(p, "%02x", sll.sll_addr[i]);
+			p += 2;
 		}
 		syslog(LOG_INFO, "RARP request from %s on if%d", tmpbuf, sll.sll_ifindex);
 	}
diff --git a/rdisc.c b/rdisc.c
index 4d7d057..1aaec9e 100644
--- a/rdisc.c
+++ b/rdisc.c
@@ -994,14 +994,14 @@ graceful_finish()
 /* From libc/rpc/pmap_rmt.c */
 
 int
-sendbcast(int s, char *packet, int packetlen)
+sendbcast(int socket, char *packet, int packetlen)
 {
 	int i, cc;
 
 	for (i = 0; i < num_interfaces; i++) {
 		if ((interfaces[i].flags & (IFF_BROADCAST|IFF_POINTOPOINT)) == 0)
 			continue;
-		cc = sendbcastif(s, packet, packetlen, &interfaces[i]);
+		cc = sendbcastif(socket, packet, packetlen, &interfaces[i]);
 		if (cc!= packetlen) {
 			return (cc);
 		}
@@ -1010,7 +1010,7 @@ sendbcast(int s, char *packet, int packetlen)
 }
 
 int
-sendbcastif(int s, char *packet, int packetlen, struct interface *ifp)
+sendbcastif(int socket, char *packet, int packetlen, struct interface *ifp)
 {
 	int on;
 	int cc;
@@ -1022,8 +1022,8 @@ sendbcastif(int s, char *packet, int packetlen, struct interface *ifp)
 		logdebug("Broadcast to %s\n",
 			 pr_name(baddr.sin_addr));
 	on = 1;
-	setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char*)&on, sizeof(on));
-	cc = sendto(s, packet, packetlen, 0,
+	setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&on, sizeof(on));
+	cc = sendto(socket, packet, packetlen, 0,
 		    (struct sockaddr *)&baddr, sizeof (struct sockaddr));
 	if (cc!= packetlen) {
 		logperror("sendbcast: sendto");
@@ -1031,19 +1031,19 @@ sendbcastif(int s, char *packet, int packetlen, struct interface *ifp)
 		       pr_name(baddr.sin_addr));
 	}
 	on = 0;
-	setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char*)&on, sizeof(on));
+	setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&on, sizeof(on));
 	return (cc);
 }
 
 int
-sendmcast(int s, char *packet, int packetlen, struct sockaddr_in *sin)
+sendmcast(int socket, char *packet, int packetlen, struct sockaddr_in *sin)
 {
 	int i, cc;
 
 	for (i = 0; i < num_interfaces; i++) {
 		if ((interfaces[i].flags & (IFF_BROADCAST|IFF_POINTOPOINT|IFF_MULTICAST)) == 0)
 			continue;
-		cc = sendmcastif(s, packet, packetlen, sin, &interfaces[i]);
+		cc = sendmcastif(socket, packet, packetlen, sin, &interfaces[i]);
 		if (cc!= packetlen) {
 			return (cc);
 		}
@@ -1052,7 +1052,7 @@ sendmcast(int s, char *packet, int packetlen, struct sockaddr_in *sin)
 }
 
 int
-sendmcastif(int s, char *packet, int packetlen,	struct sockaddr_in *sin,
+sendmcastif(int socket, char *packet, int packetlen, struct sockaddr_in *sin,
 	    struct interface *ifp)
 {
 	int cc;
@@ -1065,7 +1065,7 @@ sendmcastif(int s, char *packet, int packetlen,	struct sockaddr_in *sin,
 		logdebug("Multicast to interface %s, %s\n",
 			 ifp->name,
 			 pr_name(mreq.imr_address));
-	if (setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF,
+	if (setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF,
 		       (char *)&mreq,
 		       sizeof(mreq)) < 0) {
 		logperror("setsockopt (IP_MULTICAST_IF)");
@@ -1074,7 +1074,7 @@ sendmcastif(int s, char *packet, int packetlen,	struct sockaddr_in *sin,
 		       pr_name(mreq.imr_address));
 		return (-1);
 	}
-	cc = sendto(s, packet, packetlen, 0,
+	cc = sendto(socket, packet, packetlen, 0,
 		    (struct sockaddr *)sin, sizeof (struct sockaddr));
 	if (cc!= packetlen) {
 		logperror("sendmcast: sendto");
@@ -1361,12 +1361,12 @@ age_table(int time)
 		}
 	}
 	if (recalculate_max) {
-		int max = max_preference();
+		int max_pref = max_preference();
 
-		if (max != INELIGIBLE_PREF) {
+		if (max_pref != INELIGIBLE_PREF) {
 			tp = table;
 			while (tp) {
-				if (tp->preference == max && !tp->in_kernel) {
+				if (tp->preference == max_pref && !tp->in_kernel) {
 					add_route(tp->router);
 					tp->in_kernel++;
 				}
@@ -1392,7 +1392,7 @@ void discard_table(void)
 
 
 void
-record_router(struct in_addr router, int preference, int ttl)
+record_router(struct in_addr router, int pref, int ttl)
 {
 	struct table *tp;
 	int old_max = max_preference();
@@ -1400,24 +1400,24 @@ record_router(struct in_addr router, int preference, int ttl)
 	int changed_down = 0;	/* max preference could have decreased */
 
 	if (ttl < 4)
-		preference = INELIGIBLE_PREF;
+		pref = INELIGIBLE_PREF;
 
 	if (debug)
 		logdebug("Recording %s, ttl %d, preference 0x%x\n",
 			 pr_name(router),
 			 ttl,
-			 preference);
+			 pref);
 	tp = find_router(router);
 	if (tp) {
-		if (tp->preference > preference &&
+		if (tp->preference > pref &&
 		    tp->preference == old_max)
 			changed_down++;
-		else if (preference > tp->preference)
+		else if (pref > tp->preference)
 			changed_up++;
-		tp->preference = preference;
+		tp->preference = pref;
 		tp->remaining_time = ttl;
 	} else {
-		if (preference > old_max)
+		if (pref > old_max)
 			changed_up++;
 		tp = (struct table *)ALLIGN(malloc(sizeof(struct table)));
 		if (tp == NULL) {
@@ -1425,7 +1425,7 @@ record_router(struct in_addr router, int preference, int ttl)
 			return;
 		}
 		tp->router = router;
-		tp->preference = preference;
+		tp->preference = pref;
 		tp->remaining_time = ttl;
 		tp->in_kernel = 0;
 		tp->next = table;
diff --git a/traceroute6.c b/traceroute6.c
index ab34615..aee669b 100644
--- a/traceroute6.c
+++ b/traceroute6.c
@@ -605,16 +605,16 @@ int main(int argc, char *argv[])
 		for (probe = 0; probe < nprobes; ++probe) {
 			int cc, reset_timer;
 			struct timeval t1, t2;
-			struct timezone tz;
-			struct in6_addr to;
+			struct timezone tzone;
+			struct in6_addr to_addr;
 
-			gettimeofday(&t1, &tz);
+			gettimeofday(&t1, &tzone);
 			send_probe(++seq, ttl);
 			reset_timer = 1;
 
-			while ((cc = wait_for_reply(icmp_sock, &from, &to, reset_timer)) != 0) {
-				gettimeofday(&t2, &tz);
-				if ((i = packet_ok(packet, cc, &from, &to, seq, &t1))) {
+			while ((cc = wait_for_reply(icmp_sock, &from, &to_addr, reset_timer)) != 0) {
+				gettimeofday(&t2, &tzone);
+				if ((i = packet_ok(packet, cc, &from, &to_addr, seq, &t1))) {
 					if (memcmp(&from.sin6_addr, &lastaddr, sizeof(from.sin6_addr))) {
 						print(packet, cc, &from);
 						memcpy(&lastaddr,