Cppcheck and GCC build warning fixes

.gitignore

@@ -4,6 +4,9 @@
 *.patch
 *.rej
 *.orig
+.vimrc
+tags
+cscope.out
 
 .gdb_history
 .gdbinit

Makefile

@@ -57,7 +57,7 @@ endif
 
 # Compiler and Linker Options
 CFLAGS ?= -O2 -g
-CFLAGS += -Wall -Wtype-limits -Wunused-parameter
+CFLAGS += -Wall -Wtype-limits -Wunused-parameter -Werror -Wextra
 CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe
 CPPFLAGS += -D_GNU_SOURCE
 # Turn on transparent support for LFS

arp.c

@@ -388,7 +388,8 @@ static int arp_file(char *name)
 {
     char buff[1024];
     char *sp, *args[32];
-    int linenr, argc;
+    unsigned int linenr;
+    int argc;
     FILE *fp;
 
     if ((fp = fopen(name, "r")) == NULL) {
@@ -532,7 +533,7 @@ static int arp_show(char *name)
     char mask[100];
     char line[200];
     char dev[100];
-    int type, flags;
+    unsigned int type, flags;
     FILE *fp;
     const char *hostname;
     int num, entries = 0, showed = 0;
@@ -559,7 +560,7 @@ static int arp_show(char *name)
 	safe_strncpy(dev, "-", sizeof(dev));
 	/* Read the ARP cache entries. */
 	for (; fgets(line, sizeof(line), fp);) {
-	    num = sscanf(line, "%s 0x%x 0x%x %99s %99s %99s\n",
+	    num = sscanf(line, "%99s 0x%x 0x%x %99s %99s %99s\n",
 			 ip, &type, &flags, hwa, mask, dev);
 	    if (num < 4)
 		break;
@@ -568,14 +569,14 @@ static int arp_show(char *name)
 		 * This happens for incomplete ARP entries for which there is
 		 * no hardware address in the line.
 		 */
-		num = sscanf(line, "%s 0x%x 0x%x %99s %99s\n",
+		num = sscanf(line, "%99s 0x%x 0x%x %99s %99s\n",
 			     ip, &type, &flags, mask, dev);
 		hwa[0] = 0;
 	    }
 
 	    entries++;
 	    /* if the user specified hw-type differs, skip it */
-	    if (hw_set && (type != hw->type))
+	    if (hw_set && (type != (unsigned)hw->type))
 		continue;
 
 	    /* if the user specified address differs, skip it */
@@ -750,8 +751,10 @@ int main(int argc, char **argv)
 
 	case 'V':
 	    version();
+	    break;
 	case 'h':
 	    usage(E_USAGE);
+	    break;
 	case '?':
 	default:
 	    usage(E_OPTERR);

hostname.c

@@ -386,16 +386,17 @@ int main(int argc, char **argv)
 	    exit(1);
 	}
 	type = 'd';
-	/* NOBREAK */
+	/* fall through */
     case 0:
 	if (file) {
 	    setfilename(file, SETHOST);
 	    break;
 	}
-	if (optind < argc) {
+	if (optind < (int)argc) {
 	    sethname(argv[optind]);
 	    break;
 	}
+    /* fall through */
     case 1:
 	gethostname(myname, sizeof(myname));
 	if (opt_v)

ifconfig.c

@@ -787,7 +787,7 @@ int main(int argc, char **argv)
 #endif
 #if HAVE_AFINET
 	    { /* ipv4 address a.b.c.d */
-		in_addr_t ip, nm, bc;
+		in_addr_t ip, nm = 0, bc = 0;
 		safe_strncpy(host, *spp, (sizeof host));
 		if (inet_aftype.input(0, host, &_sa) < 0) {
 		    ap->herror(host);
@@ -880,7 +880,7 @@ int main(int argc, char **argv)
 #if HAVE_AFINET
 	    {
 		/* ipv4 address a.b.c.d */
-		in_addr_t ip, nm, bc;
+		in_addr_t ip, nm = 0, bc = 0;
 		safe_strncpy(host, *spp, (sizeof host));
 		if (inet_aftype.input(0, host, &_sa) < 0) {
 		    ap->herror(host);
@@ -1064,7 +1064,6 @@ int main(int argc, char **argv)
 
     if (neednetmask) {
 	goterr |= set_netmask(skfd, &ifr, samask);
-	didnetmask++;
     }
 
     if (opt_v && goterr)

include/util-ank.h

@@ -67,10 +67,8 @@ extern int do_ipaddr(int argc, char **argv);
 extern int do_iproute(int argc, char **argv);
 extern int do_iprule(int argc, char **argv);
 extern int do_ipneigh(int argc, char **argv);
-extern int do_iptunnel(int argc, char **argv);
 extern int do_iplink(int argc, char **argv);
 extern int do_ipmonitor(int argc, char **argv);
-extern int do_multiaddr(int argc, char **argv);
 extern int do_qdisc(int argc, char **argv);
 extern int do_class(int argc, char **argv);
 extern int do_filter(int argc, char **argv);

ipmaddr.c

@@ -75,7 +75,7 @@ static int parse_lla(char *str, char *addr)
 	int len=0;
 
 	while (*str) {
-		int tmp;
+		unsigned int tmp;
 		if (str[0] == ':' || str[0] == '.') {
 			str++;
 			continue;
@@ -93,10 +93,10 @@ static int parse_lla(char *str, char *addr)
 
 static int parse_hex(char *str, unsigned char *dst, size_t dstlen)
 {
-	int len=0;
+	size_t len = 0;
 
 	while (len < dstlen && *str) {
-		int tmp;
+		unsigned int tmp;
 		if (str[1] == 0)
 			return -1;
 		if (sscanf(str, "%02x", &tmp) != 1)
@@ -118,7 +118,7 @@ struct ma_info
 	inet_prefix	addr;
 };
 
-void maddr_ins(struct ma_info **lst, struct ma_info *m)
+static void maddr_ins(struct ma_info **lst, struct ma_info *m)
 {
 	struct ma_info *mp;
 
@@ -130,7 +130,7 @@ void maddr_ins(struct ma_info **lst, struct ma_info *m)
 	*lst = m;
 }
 
-void read_dev_mcast(struct ma_info **result_p)
+static void read_dev_mcast(struct ma_info **result_p)
 {
 	char buf[256];
 	FILE *fp = fopen(_PATH_PROCNET_DEV_MCAST, "r");
@@ -145,7 +145,7 @@ void read_dev_mcast(struct ma_info **result_p)
 		int st;
 
 		memset(&m, 0, sizeof(m));
-		sscanf(buf, "%d%s%d%d%s", &m.index, m.name, &m.users, &st,
+		sscanf(buf, "%d%15s%d%d%255s", &m.index, m.name, &m.users, &st,
 		       hexa);
 		if (filter_dev[0] && strcmp(filter_dev, m.name))
 			continue;
@@ -166,7 +166,7 @@ void read_dev_mcast(struct ma_info **result_p)
 	fclose(fp);
 }
 
-void read_igmp(struct ma_info **result_p)
+static void read_igmp(struct ma_info **result_p)
 {
 	struct ma_info m, *ma = NULL;
 	char buf[256];
@@ -175,16 +175,17 @@ void read_igmp(struct ma_info **result_p)
 	if (!fp)
 		return;
 	memset(&m, 0, sizeof(m));
-	if (fgets(buf, sizeof(buf), fp))
+	if (fgets(buf, sizeof(buf), fp)) {
 		/* eat line */;
+    }
 
 	m.addr.family = AF_INET;
 	m.addr.bitlen = 32;
 	m.addr.bytelen = 4;
 
 	while (fgets(buf, sizeof(buf), fp)) {
 		if (buf[0] != '\t') {
-			sscanf(buf, "%d%s", &m.index, m.name);
+			sscanf(buf, "%d%15s", &m.index, m.name);
 			continue;
 		}
 
@@ -200,8 +201,7 @@ void read_igmp(struct ma_info **result_p)
 	fclose(fp);
 }
 
-
-void read_igmp6(struct ma_info **result_p)
+static void read_igmp6(struct ma_info **result_p)
 {
 	char buf[256];
 	FILE *fp = fopen(_PATH_PROCNET_IGMP6, "r");
@@ -215,7 +215,7 @@ void read_igmp6(struct ma_info **result_p)
 		int len;
 
 		memset(&m, 0, sizeof(m));
-		sscanf(buf, "%d%s%s%d", &m.index, m.name, hexa, &m.users);
+		sscanf(buf, "%d%15s%255s%d", &m.index, m.name, hexa, &m.users);
 
 		if (filter_dev[0] && strcmp(filter_dev, m.name))
 			continue;
@@ -289,7 +289,7 @@ static int multiaddr_list(int argc, char **argv)
 		if (strcmp(*argv, "dev") == 0) {
 			NEXT_ARG();
 			l = strlen(*argv);
-			if (l <= 0 || l >= sizeof(filter_dev))
+			if (l == 0 || l >= sizeof(filter_dev))
 				usage(E_OPTERR);
 			strncpy(filter_dev, *argv, sizeof (filter_dev));
 		} else if (strcmp(*argv, "all") == 0) {
@@ -302,7 +302,7 @@ static int multiaddr_list(int argc, char **argv)
 			filter_family = AF_PACKET;
 		} else {
 			l = strlen(*argv);
-			if (l <= 0 || l >= sizeof(filter_dev))
+			if (l == 0 || l >= sizeof(filter_dev))
 				usage(E_OPTERR);
 			strncpy(filter_dev, *argv, sizeof (filter_dev));
 		}
@@ -319,7 +319,7 @@ static int multiaddr_list(int argc, char **argv)
 	return 0;
 }
 
-int multiaddr_modify(int cmd, int argc, char **argv)
+static int multiaddr_modify(int cmd, int argc, char **argv)
 {
 	struct ifreq ifr;
 	int fd;
@@ -362,8 +362,7 @@ int multiaddr_modify(int cmd, int argc, char **argv)
 	exit(0);
 }
 
-
-int do_multiaddr(int argc, char **argv)
+static int do_multiaddr(int argc, char **argv)
 {
 	if (argc < 1)
 		return multiaddr_list(0, NULL);
@@ -383,20 +382,12 @@ int resolve_hosts = 0;
 
 int main(int argc, char **argv)
 {
-	char *basename;
-
 #if I18N
 	setlocale (LC_ALL, "");
 	bindtextdomain("net-tools", "/usr/share/locale");
 	textdomain("net-tools");
 #endif
 
-	basename = strrchr(argv[0], '/');
-	if (basename == NULL)
-		basename = argv[0];
-	else
-		basename++;
-
 	while (argc > 1) {
 		if (argv[1][0] != '-')
 			break;

iptunnel.c

@@ -382,7 +382,7 @@ static int do_add(int cmd, int argc, char **argv)
 	return -1;
 }
 
-int do_del(int argc, char **argv)
+static int do_del(int argc, char **argv)
 {
 	struct ip_tunnel_parm p;
 
@@ -402,7 +402,7 @@ int do_del(int argc, char **argv)
 	return -1;
 }
 
-void print_tunnel(struct ip_tunnel_parm *p)
+static void print_tunnel(struct ip_tunnel_parm *p)
 {
 	char s1[256];
 	char s2[256];
@@ -476,16 +476,18 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
 		return -1;
 	}
 
-	if (fgets(buf, sizeof(buf), fp))
+	if (fgets(buf, sizeof(buf), fp)) {
 		/* eat line */;
-	if (fgets(buf, sizeof(buf), fp))
+    }
+	if (fgets(buf, sizeof(buf), fp)) {
 		/* eat line */;
+    }
 
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
 		char *ptr;
 		buf[sizeof(buf) - 1] = 0;
 		if ((ptr = strchr(buf, ':')) == NULL ||
-		    (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
+		    (*ptr++ = 0, sscanf(buf, "%511s", name) != 1)) {
 			fprintf(stderr, _("Wrong format of /proc/net/dev. Sorry.\n"));
 			fclose(fp);
 			return -1;
@@ -517,10 +519,10 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
 		print_tunnel(&p1);
 		if (show_stats) {
 			printf(_("RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"));
-			printf("    %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld\n",
+			printf("    %-10lu %-12lu %-6lu %-8lu %-8lu %-8lu\n",
 			       rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi);
 			printf(_("TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"));
-			printf("    %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld\n\n",
+			printf("    %-10lu %-12lu %-6lu %-8lu %-8lu %-6lu\n\n",
 			       tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops);
 		}
 	}
@@ -557,7 +559,7 @@ static int do_show(int argc, char **argv)
 	return 0;
 }
 
-int do_iptunnel(int argc, char **argv)
+static int do_iptunnel(int argc, char **argv)
 {
 	if (argc > 0) {
 		if (matches(*argv, "add") == 0)
@@ -583,20 +585,12 @@ int resolve_hosts = 0;
 
 int main(int argc, char **argv)
 {
-	char *basename;
-
 #if I18N
 	setlocale (LC_ALL, "");
 	bindtextdomain("net-tools", "/usr/share/locale");
 	textdomain("net-tools");
 #endif
 
-	basename = strrchr(argv[0], '/');
-	if (basename == NULL)
-		basename = argv[0];
-	else
-		basename++;
-
 	while (argc > 1) {
 		if (argv[1][0] != '-')
 			break;

lib/arcnet.c

@@ -117,7 +117,7 @@ static int in_arcnet(char *bufp, struct sockaddr_storage *sasp)
 struct hwtype arcnet_hwtype =
 {
     "arcnet", NULL, /*"2.5Mbps ARCnet", */ ARPHRD_ARCNET, 1,
-    pr_arcnet, in_arcnet, NULL
+    pr_arcnet, in_arcnet, NULL, 0
 };
 
 

lib/ax25.c

@@ -88,7 +88,7 @@ static int AX25_input(int type, char *bufp, struct sockaddr_storage *sasp)
     struct sockaddr *sap = (struct sockaddr *)sasp;
     char *ptr;
     char *orig, c;
-    int i;
+    size_t i;
 
     (void)type; /* unused */
     sap->sa_family = ax25_aftype.af;
@@ -190,7 +190,7 @@ static int KISS_init(int fd)
 struct hwtype ax25_hwtype =
 {
     "ax25", NULL, /*"AMPR AX.25", */ ARPHRD_AX25, 7,
-    AX25_print, AX25_hinput, NULL
+    AX25_print, AX25_hinput, NULL, 0
 };
 
 struct aftype ax25_aftype =