- (void)printf() -> printf(); the cast adds clutter for little value.

- fprintf(stdout, ...) -> printf()
- fputs(x, stdout) -> printf(); for consistency.
fputs is twice as fast on atom x5-Z8300@1.44GHz but Amdahl sees a pure printf
tcpdump only 2% slower than a pure fputs (for constant strings) tcpdump
to /dev/null across a 20MB/~170k packet pcap file.

ok dlg@ for fputs and ok tedu@ krw@ deraadt@ a2k19 for the rest

1 files changed, 65 insertions, 65 deletions

diff --git a/usr.sbin/tcpdump/print-tcp.c b/usr.sbin/tcpdump/print-tcp.c
index 6317cbc355f..ec6053e73c9 100644
--- a/usr.sbin/tcpdump/print-tcp.c
+++ b/usr.sbin/tcpdump/print-tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-tcp.c,v 1.38 2018/10/22 16:12:45 kn Exp $	*/
+/*	$OpenBSD: print-tcp.c,v 1.39 2020/01/24 22:46:37 procter Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -201,25 +201,25 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 		ip6 = (struct ip6_hdr *)bp2;
 		break;
 	default:
-		(void)printf("invalid ip version");
+		printf("invalid ip version");
 		return;
 	}
 
 	ch = '\0';
 	if (length < sizeof(*tp)) {
-		(void)printf("truncated-tcp %u", length);
+		printf("truncated-tcp %u", length);
 		return;
 	}
 
 	if (!TTEST(tp->th_dport)) {
 		if (ip6) {
-			(void)printf("%s > %s: [|tcp]",
-				ip6addr_string(&ip6->ip6_src),
-				ip6addr_string(&ip6->ip6_dst));
+			printf("%s > %s: [|tcp]",
+			    ip6addr_string(&ip6->ip6_src),
+			    ip6addr_string(&ip6->ip6_dst));
 		} else {
-			(void)printf("%s > %s: [|tcp]",
-				ipaddr_string(&ip->ip_src),
-				ipaddr_string(&ip->ip_dst));
+			printf("%s > %s: [|tcp]",
+			    ipaddr_string(&ip->ip_src),
+			    ipaddr_string(&ip->ip_dst));
 		}
 		return;
 	}
@@ -229,30 +229,30 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 
 	if (ip6) {
 		if (ip6->ip6_nxt == IPPROTO_TCP) {
-			(void)printf("%s.%s > %s.%s: ",
-				ip6addr_string(&ip6->ip6_src),
-				tcpport_string(sport),
-				ip6addr_string(&ip6->ip6_dst),
-				tcpport_string(dport));
+			printf("%s.%s > %s.%s: ",
+			    ip6addr_string(&ip6->ip6_src),
+			    tcpport_string(sport),
+			    ip6addr_string(&ip6->ip6_dst),
+			    tcpport_string(dport));
 		} else {
-			(void)printf("%s > %s: ",
-				tcpport_string(sport), tcpport_string(dport));
+			printf("%s > %s: ",
+			    tcpport_string(sport), tcpport_string(dport));
 		}
 	} else {
 		if (ip->ip_p == IPPROTO_TCP) {
-			(void)printf("%s.%s > %s.%s: ",
-				ipaddr_string(&ip->ip_src),
-				tcpport_string(sport),
-				ipaddr_string(&ip->ip_dst),
-				tcpport_string(dport));
+			printf("%s.%s > %s.%s: ",
+			    ipaddr_string(&ip->ip_src),
+			    tcpport_string(sport),
+			    ipaddr_string(&ip->ip_dst),
+			    tcpport_string(dport));
 		} else {
-			(void)printf("%s > %s: ",
-				tcpport_string(sport), tcpport_string(dport));
+			printf("%s > %s: ",
+			    tcpport_string(sport), tcpport_string(dport));
 		}
 	}
 
 	if (!qflag && TTEST(tp->th_seq) && !TTEST(tp->th_ack))
-		(void)printf("%u ", ntohl(tp->th_seq));
+		printf("%u ", ntohl(tp->th_seq));
 
 	TCHECK(*tp);
 	seq = ntohl(tp->th_seq);
@@ -262,7 +262,7 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 	hlen = tp->th_off * 4;
 
 	if (qflag) {
-		(void)printf("tcp %d", length - tp->th_off * 4);
+		printf("tcp %d", length - tp->th_off * 4);
 		return;
 	} else if (packettype != PT_TCP) {
 
@@ -376,7 +376,7 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 	}
 	hlen = tp->th_off * 4;
 	if (hlen > length) {
-		(void)printf(" [bad hdr length]");
+		printf(" [bad hdr length]");
 		return;
 	}
 
@@ -386,10 +386,10 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 			sum = tcp_cksum(ip, tp, length);
 			if (sum != 0) {
 				tcp_sum = EXTRACT_16BITS(&tp->th_sum);
-				(void)printf(" [bad tcp cksum %x! -> %x]", tcp_sum,
+				printf(" [bad tcp cksum %x! -> %x]", tcp_sum,
 				    in_cksum_shouldbe(tcp_sum, sum));
 			} else
-				(void)printf(" [tcp sum ok]");
+				printf(" [tcp sum ok]");
 		}
 	}
 	if (ip6 && ip6->ip6_plen && vflag) {
@@ -398,10 +398,10 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 			sum = tcp6_cksum(ip6, tp, length);
 			if (sum != 0) {
 				tcp_sum = EXTRACT_16BITS(&tp->th_sum);
-				(void)printf(" [bad tcp cksum %x! -> %x]", tcp_sum,
+				printf(" [bad tcp cksum %x! -> %x]", tcp_sum,
 				    in_cksum_shouldbe(tcp_sum, sum));
 			} else
-				(void)printf(" [tcp sum ok]");
+				printf(" [tcp sum ok]");
 		}
 	}
 
@@ -440,14 +440,14 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 
 	length -= hlen;
 	if (vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST))
-		(void)printf(" %u:%u(%u)", seq, seq + length, length);
+		printf(" %u:%u(%u)", seq, seq + length, length);
 	if (flags & TH_ACK)
-		(void)printf(" ack %u", ack);
+		printf(" ack %u", ack);
 
-	(void)printf(" win %u", win);
+	printf(" win %u", win);
 
 	if (flags & TH_URG)
-		(void)printf(" urg %u", urp);
+		printf(" urg %u", urp);
 	/*
 	 * Handle any options.
 	 */
@@ -480,32 +480,32 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 			switch (opt) {
 
 			case TCPOPT_MAXSEG:
-				(void)printf("mss");
+				printf("mss");
 				datalen = 2;
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_16BITS(cp));
+				printf(" %u", EXTRACT_16BITS(cp));
 
 				break;
 
 			case TCPOPT_EOL:
-				(void)printf("eol");
+				printf("eol");
 				break;
 
 			case TCPOPT_NOP:
-				(void)printf("nop");
+				printf("nop");
 				break;
 
 			case TCPOPT_WSCALE:
-				(void)printf("wscale");
+				printf("wscale");
 				datalen = 1;
 				LENCHECK(datalen);
-				(void)printf(" %u", *cp);
+				printf(" %u", *cp);
 				break;
 
 			case TCPOPT_SACKOK:
-				(void)printf("sackOK");
+				printf("sackOK");
 				if (len != 2)
-					(void)printf("[len %d]", len);
+					printf("[len %d]", len);
 				break;
 
 			case TCPOPT_SACK:
@@ -515,8 +515,8 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 				datalen = len - 2;
 				if ((datalen % TCPOLEN_SACK) != 0 ||
 				    !(flags & TH_ACK)) {
-				         (void)printf("malformed sack ");
-					 (void)printf("[len %d] ", datalen);
+				         printf("malformed sack ");
+					 printf("[len %d] ", datalen);
 					 break;
 				}
 				printf("sack %d ", datalen/TCPOLEN_SACK);
@@ -533,69 +533,69 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 							e -= th->ack;
 						}
 					}
-					(void) printf("{%lu:%lu} ", s, e);
+					printf("{%lu:%lu} ", s, e);
 				}
 				break;
 			}
 			case TCPOPT_ECHO:
-				(void)printf("echo");
+				printf("echo");
 				datalen = 4;
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_32BITS(cp));
+				printf(" %u", EXTRACT_32BITS(cp));
 				break;
 
 			case TCPOPT_ECHOREPLY:
-				(void)printf("echoreply");
+				printf("echoreply");
 				datalen = 4;
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_32BITS(cp));
+				printf(" %u", EXTRACT_32BITS(cp));
 				break;
 
 			case TCPOPT_TIMESTAMP:
-				(void)printf("timestamp");
+				printf("timestamp");
 				datalen = 8;
 				LENCHECK(4);
-				(void)printf(" %u", EXTRACT_32BITS(cp));
+				printf(" %u", EXTRACT_32BITS(cp));
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_32BITS(cp + 4));
+				printf(" %u", EXTRACT_32BITS(cp + 4));
 				break;
 
 			case TCPOPT_CC:
-				(void)printf("cc");
+				printf("cc");
 				datalen = 4;
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_32BITS(cp));
+				printf(" %u", EXTRACT_32BITS(cp));
 				break;
 
 			case TCPOPT_CCNEW:
-				(void)printf("ccnew");
+				printf("ccnew");
 				datalen = 4;
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_32BITS(cp));
+				printf(" %u", EXTRACT_32BITS(cp));
 				break;
 
 			case TCPOPT_CCECHO:
-				(void)printf("ccecho");
+				printf("ccecho");
 				datalen = 4;
 				LENCHECK(datalen);
-				(void)printf(" %u", EXTRACT_32BITS(cp));
+				printf(" %u", EXTRACT_32BITS(cp));
 				break;
 
 			case TCPOPT_SIGNATURE:
-				(void)printf("tcpmd5:");
+				printf("tcpmd5:");
 				datalen = len - 2;
 				for (i = 0; i < datalen; ++i) {
 					LENCHECK(i+1);
-					(void)printf("%02x", cp[i]);
+					printf("%02x", cp[i]);
 				}
 				break;
 
 			default:
-				(void)printf("opt-%d:", opt);
+				printf("opt-%d:", opt);
 				datalen = len - 2;
 				for (i = 0; i < datalen; ++i) {
 					LENCHECK(i+1);
-					(void)printf("%02x", cp[i]);
+					printf("%02x", cp[i]);
 				}
 				break;
 			}
@@ -609,7 +609,7 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 			if (!ZEROLENOPT(opt))
 				++datalen;		/* size octet */
 			if (datalen != len)
-				(void)printf("[len %d]", len);
+				printf("[len %d]", len);
 			ch = ',';
 			if (opt == TCPOPT_EOL)
 				break;
@@ -640,12 +640,12 @@ tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 	}
 	return;
 bad:
-	fputs("[bad opt]", stdout);
+	printf("[bad opt]");
 	if (ch != '\0')
 		putchar('>');
 	return;
 trunc:
-	fputs("[|tcp]", stdout);
+	printf("[|tcp]");
 	if (ch != '\0')
 		putchar('>');
 }