badger/tests: more minor lint reduction in C code

based on reading cppcheck output

Author: ldoolitt

badger/tests/crc32.c

@@ -11,18 +11,14 @@ static uint32_t crc_table[256];
 /* Generate the CRC table. Must be called before calculating the CRC value. */
 void init_crc32(uint32_t poly)
 {
-  uint32_t crc;
-  int i, j;
-
-  for(i = 0; i < 256; i++) {
-    crc = i;
-    for(j = 8; j > 0; j--) {
-      if(crc & 1) crc = (crc >> 1) ^ poly;
+  for(unsigned i = 0; i < 256; i++) {
+    uint32_t crc = i;
+    for(int j = 8; j > 0; j--) {
+      if (crc & 1) crc = (crc >> 1) ^ poly;
       else crc >>= 1;
     }
     crc_table[i] = crc;
   }
-
   crc_table_init = 1;
 }
 

badger/tests/crc_derive.c

@@ -10,11 +10,10 @@
 static unsigned long crc_eval( unsigned int order, unsigned long poly, unsigned long crc,
 	unsigned int width, unsigned long inword)
 {
-	unsigned int bit, u;
 	unsigned long mask_c = 1UL << (order-1);
 	unsigned long mask_d = 1UL << (width-1);
-	for (u=0; u<width; u++) {
-		bit = ((crc&mask_c)!=0) ^ ((inword&mask_d)!=0);
+	for (unsigned int u=0; u<width; u++) {
+		unsigned int bit = ((crc&mask_c)!=0) ^ ((inword&mask_d)!=0);
 		if (0) printf("u=%u crc=%lx inword=%lx bit=%u poly=%lx\n",
 			u, crc, inword, bit, poly);
 		inword = inword << 1;

badger/tests/crc_selfcheck.c

@@ -9,11 +9,6 @@
 
 #define ETH_MAXLEN 1500   /* maximum line length */
 
-struct pbuf {
-	char buf[ETH_MAXLEN+12];
-	int cur, len;
-};
-
 static int ethernet_check(char *packet, unsigned len)
 {
 	char *p=packet;
@@ -50,17 +45,16 @@ static int ethernet_check(char *packet, unsigned len)
 static unsigned int readmemh(FILE *f, char *buff, size_t avail)
 {
 	size_t u;
-	int rc;
 	for (u=0; u<avail; u++) {
 		unsigned int h;
-		rc=fscanf(f, "%x", &h);
+		int rc = fscanf(f, "%x", &h);
 		if (rc!=1) break;
-		buff[u]=h;
+		buff[u] = h;
 	}
 	return u;
 }
 
-int main(int argc, char *argv[])
+int main(int argc, const char *argv[])
 {
 	FILE *f;
 	unsigned int l;

badger/tests/ethernet_model.c

@@ -62,7 +62,7 @@ int ethernet_model(int out_octet, int out_valid, int *in_octet, int *in_valid, i
 	static int sleepctr=0;
 	static int sleepmax=1;
 	char in_txt[15], out_txt[15];
-	int ethernet_model_debug = 0;  /* adjustable */
+	const int ethernet_model_debug = 0;  /* adjustable */
 
 	if (out_valid) {
 		sprintf(out_txt, "0x%2.2x", (unsigned int)(out_octet&0xff));

badger/tests/host_cmds_gen.c

@@ -43,16 +43,18 @@ int main(int argc, char *argv[])
 	char idata[200];
 	if (argc < 2) {
 		fprintf(stderr, "Usage: %s mac_subset.gold\n", argv[0]);
+		fprintf(stderr, "  always writes to host_cmds.dat\n");
 		return 1;
 	}
 	FILE *fin = fopen(argv[1], "r");
 	if (!fin) {
-		perror("mac_subset.gold");
+		perror(argv[1]);
 		return 1;
 	}
 	FILE *fout = fopen("host_cmds.dat", "w");
 	if (!fout) {
 		perror("host_cmds.dat");
+		fclose(fin);
 		return 1;
 	}
 	while (fgets(idata, sizeof(idata), fin)) {

badger/tests/pcap2v.c

@@ -44,7 +44,7 @@ void print_stream(pcap_t *pbuf)
 		total++;
 		/* if (total > 80) break; */
 	}
-	printf("tests %d\n", total);
+	printf("tests %u\n", total);
 }
 
 int main(int argc, char *argv[])

badger/tests/udp_model.c

@@ -140,7 +140,7 @@ struct udp_state *udp_setup_r(unsigned short udp_port_, int badger_client_)
 void udp_receiver_r(struct udp_state *ust, int *in_octet, int *in_valid, int *in_count, int thinking)
 {
 	int val = 0;
-	int udp_model_debug = 0;  /* adjustable */
+	const int udp_model_debug = 0;  /* adjustable */
 	struct pbuf *inbuf = ust->inbuf;  /* makes source look cleaner; maybe optimizes away */
 
 	if (inbuf->cur == inbuf->len) {
@@ -220,7 +220,7 @@ void udp_sender(int out_octet, int out_end)
 void udp_sender_r(struct udp_state *ust, int out_octet, int out_end)
 {
 	struct pbuf *outbuf = ust->outbuf;  /* makes source look cleaner; maybe optimizes away */
-	int udp_model_debug = 0;  /* adjustable */
+	const int udp_model_debug = 0;  /* adjustable */
 	if (1) {
 		if (udp_model_debug) fprintf(stderr, "Trying to write %2.2x\n", (unsigned) out_octet);
 		outbuf->buf[outbuf->cur] = out_octet;

badger/tests/udprtx.c

@@ -13,9 +13,8 @@
 #define LEN_MOD (981)
 #define LEN_F(x) (492+((x)*8)%LEN_MOD)
 #define NEXT(x) ((x*3+1)&0xff)
-static unsigned udp_handle(char *data, unsigned data_len)
+static unsigned udp_handle(const char *data, unsigned data_len)
 {
-	unsigned u;
 	unsigned key = data[0]&0xff;
 	unsigned sta = key;
 	unsigned want_len = LEN_F(key);
@@ -31,7 +30,7 @@ static unsigned udp_handle(char *data, unsigned data_len)
 		printf("length not %u", want_len);
 		fail++;
 	}
-	if (1) for (u=0; u<data_len; u++) {
+	if (1) for (unsigned u=0; u<data_len; u++) {
 		unsigned want_d = sta ^ (u&0xff);
 		unsigned actual_d = data[u]&0xff;
 		if (actual_d != want_d) {
@@ -70,25 +69,24 @@ static void primary_loop(int usd, unsigned npack, unsigned juggle)
 	struct sockaddr sa_xmit;
 	unsigned int sa_xmit_len;
 	struct timeval to;
-	int i, pack_len;
-	int debug1=0;
+	int pack_len;
+	const int debug1=0;
 	unsigned probes_sent=0, probes_recv=0, probes_fail=0;
 	unsigned timeouts=0;
 	static char incoming[1500];
 	sa_xmit_len=sizeof sa_xmit;
 	for (probes_sent=0; probes_sent<juggle; probes_sent++) {
 		send_packet(usd, probes_sent);
 	}
-	to.tv_sec=0;
-	to.tv_usec=0;
 	for (;npack == 0 || probes_recv < npack;) {
+		int i;
 		FD_ZERO(&fds_r);
 		FD_SET(usd,&fds_r);
 		FD_ZERO(&fds_e);
 		FD_SET(usd,&fds_e);
 		to.tv_sec=0;
 		to.tv_usec=10000;
-		i=select(usd+1,&fds_r,NULL,&fds_e,&to);
+		i = select(usd+1,&fds_r,NULL,&fds_e,&to);
 		  /* Wait on read or error */
 		if (debug1) printf("select returns %d,", i);
 		if ((i!=1)||(!FD_ISSET(usd,&fds_r))) {
@@ -123,6 +121,7 @@ static void primary_loop(int usd, unsigned npack, unsigned juggle)
 		}
 		to.tv_sec=0;
 		to.tv_usec=0;
+		/* Remember there's a continue statement above */
 	}
 	printf("%u packets sent, %u received, %u failed, %u timeouts\n",
 		probes_sent, probes_recv, probes_fail, timeouts);
@@ -131,7 +130,7 @@ static void primary_loop(int usd, unsigned npack, unsigned juggle)
 static void stuff_net_addr(struct in_addr *p, char *hostname)
 {
 	struct hostent *server;
-	server=gethostbyname(hostname);
+	server = gethostbyname(hostname);
 	if (server == NULL) {
 		herror(hostname);
 		exit(1);