Fix incorrect string formats for netstat/s

PR:		117175
Obtained from:	Weongyo Jeong (weongyo.jeong@gmail.com)
MFC after:	1 week

1 files changed, 48 insertions, 48 deletions

diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 99cb6ff..70f54d2 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -549,10 +549,10 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	p(sctps_recvauth, "\t\t%ju input AUTH chunk%s\n");
 	p(sctps_recvauthmissing, "\t\t%ju chunk%s missing AUTH\n");
 	p(sctps_recvivalhmacid, "\t\t%ju invalid HMAC id%s received\n");
-	p(sctps_recvivalkeyid, "\t\t%ju invalid %secret ids received\n");
+	p(sctps_recvivalkeyid, "\t\t%ju invalid secret id%s received\n");
 	p1a(sctps_recvauthfailed, "\t\t%ju auth failed\n");
-	p(sctps_recvexpress, "\t\t%ju fa%st path receives all one chunk\n");
-	p(sctps_recvexpressm, "\t\t%ju fa%st path multi-part data\n");
+	p1a(sctps_recvexpress, "\t\t%ju fast path receives all one chunk\n");
+	p1a(sctps_recvexpressm, "\t\t%ju fast path multi-part data\n");
 
 	/*
 	 * output statistics
@@ -560,8 +560,8 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	p(sctps_sendpackets, "\t%ju output packet%s\n");
 	p(sctps_sendsacks, "\t\t%ju output SACK%s\n");
 	p(sctps_senddata, "\t\t%ju output DATA chunk%s\n");
-	p(sctps_sendretransdata, "\t\t%ju retran%smitted DATA chunks\n");
-	p(sctps_sendfastretrans, "\t\t%ju fa%st retransmitted DATA chunks\n");
+	p(sctps_sendretransdata, "\t\t%ju retransmitted DATA chunk%s\n");
+	p(sctps_sendfastretrans, "\t\t%ju fast retransmitted DATA chunk%s\n");
 	p(sctps_sendmultfastretrans, "\t\t%ju FR'%s that happened more "
 	    "than once to same chunk.\n");
 	p(sctps_sendheartbeat, "\t\t%ju intput HB chunk%s\n");
@@ -574,17 +574,17 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	 */
 	printf("\tPacket drop statistics:\n");
 	p1a(sctps_pdrpfmbox, "\t\t%ju from middle box\n");
-	p(sctps_pdrpfehos, "\t\t%ju from end ho%st\n");
+	p1a(sctps_pdrpfehos, "\t\t%ju from end host\n");
 	p1a(sctps_pdrpmbda, "\t\t%ju with data\n");
 	p1a(sctps_pdrpmbct, "\t\t%ju non-data, non-endhost\n");
-	p(sctps_pdrpbwrpt, "\t\t%ju non-endho%st, bandwidth rep only\n");
+	p1a(sctps_pdrpbwrpt, "\t\t%ju non-endhost, bandwidth rep only\n");
 	p1a(sctps_pdrpcrupt, "\t\t%ju not enough for chunk header\n");
 	p1a(sctps_pdrpnedat, "\t\t%ju not enough data to confirm\n");
-	p(sctps_pdrppdbrk, "\t\t%ju where proce%ss_chunk_drop said break\n");
+	p1a(sctps_pdrppdbrk, "\t\t%ju where process_chunk_drop said break\n");
 	p1a(sctps_pdrptsnnf, "\t\t%ju failed to find TSN\n");
-	p(sctps_pdrpdnfnd, "\t\t%ju attempt rever%se TSN lookup\n");
-	p(sctps_pdrpdiwnp, "\t\t%ju e-ho%st confirms zero-rwnd\n");
-	p(sctps_pdrpdizrw, "\t\t%ju midbox confirm%s no space\n");
+	p1a(sctps_pdrpdnfnd, "\t\t%ju attempt reverse TSN lookup\n");
+	p1a(sctps_pdrpdiwnp, "\t\t%ju e-host confirms zero-rwnd\n");
+	p1a(sctps_pdrpdizrw, "\t\t%ju midbox confirms no space\n");
 	p1a(sctps_pdrpbadd, "\t\t%ju data did not match TSN\n");
 	p(sctps_pdrpmark, "\t\t%ju TSN'%s marked for Fast Retran\n");
 
@@ -596,44 +596,44 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	p(sctps_timodata, "\t\t%ju T3 data time out%s\n");
 	p(sctps_timowindowprobe, "\t\t%ju window probe (T3) timer%s fired\n");
 	p(sctps_timoinit, "\t\t%ju INIT timer%s fired\n");
-	p(sctps_timosack, "\t\t%ju %sack timers fired\n");
-	p(sctps_timoshutdown, "\t\t%ju %shutdown timers fired\n");
+	p(sctps_timosack, "\t\t%ju sack timer%s fired\n");
+	p(sctps_timoshutdown, "\t\t%ju shutdown timer%s fired\n");
 	p(sctps_timoheartbeat, "\t\t%ju heartbeat timer%s fired\n");
 	p1a(sctps_timocookie, "\t\t%ju a cookie timeout fired\n");
 	p1a(sctps_timosecret, "\t\t%ju an endpoint changed its cookie"
 	    "secret\n");
 	p(sctps_timopathmtu, "\t\t%ju PMTU timer%s fired\n");
-	p(sctps_timoshutdownack, "\t\t%ju %shutdown ack timers fired\n");
-	p(sctps_timoshutdownguard, "\t\t%ju %shutdown guard timers fired\n");
-	p(sctps_timostrmrst, "\t\t%ju %stream reset timers fired\n");
+	p(sctps_timoshutdownack, "\t\t%ju shutdown ack timer%s fired\n");
+	p(sctps_timoshutdownguard, "\t\t%ju shutdown guard timer%s fired\n");
+	p(sctps_timostrmrst, "\t\t%ju stream reset timer%s fired\n");
 	p(sctps_timoearlyfr, "\t\t%ju early FR timer%s fired\n");
 	p1a(sctps_timoasconf, "\t\t%ju an asconf timer fired\n");
 	p1a(sctps_timoautoclose, "\t\t%ju auto close timer fired\n");
-	p(sctps_timoassockill, "\t\t%ju a%soc free timers expired\n");
+	p(sctps_timoassockill, "\t\t%ju asoc free timer%s expired\n");
 	p(sctps_timoinpkill, "\t\t%ju inp free timer%s expired\n");
 
 #if 0
 	/*
 	 * Early fast retransmission counters
 	 */
-	p(sctps_earlyfrstart, "\t%ju TODO:%sctps_earlyfrstart\n");
-	p(sctps_earlyfrstop, "\t%ju TODO:sctp%s_earlyfrstop\n");
-	p(sctps_earlyfrmrkretrans, "\t%ju TODO:%sctps_earlyfrmrkretrans\n");
-	p(sctps_earlyfrstpout, "\t%ju TODO:%sctps_earlyfrstpout\n");
-	p(sctps_earlyfrstpidsck1, "\t%ju TODO:%sctps_earlyfrstpidsck1\n");
-	p(sctps_earlyfrstpidsck2, "\t%ju TODO:%sctps_earlyfrstpidsck2\n");
-	p(sctps_earlyfrstpidsck3, "\t%ju TODO:%sctps_earlyfrstpidsck3\n");
-	p(sctps_earlyfrstpidsck4, "\t%ju TODO:%sctps_earlyfrstpidsck4\n");
-	p(sctps_earlyfrstrid, "\t%ju TODO:%sctps_earlyfrstrid\n");
-	p(sctps_earlyfrstrout, "\t%ju TODO:%sctps_earlyfrstrout\n");
-	p(sctps_earlyfrstrtmr, "\t%ju TODO:%sctps_earlyfrstrtmr\n");
+	p(sctps_earlyfrstart, "\t%ju TODO:sctps_earlyfrstart\n");
+	p(sctps_earlyfrstop, "\t%ju TODO:sctps_earlyfrstop\n");
+	p(sctps_earlyfrmrkretrans, "\t%ju TODO:sctps_earlyfrmrkretrans\n");
+	p(sctps_earlyfrstpout, "\t%ju TODO:sctps_earlyfrstpout\n");
+	p(sctps_earlyfrstpidsck1, "\t%ju TODO:sctps_earlyfrstpidsck1\n");
+	p(sctps_earlyfrstpidsck2, "\t%ju TODO:sctps_earlyfrstpidsck2\n");
+	p(sctps_earlyfrstpidsck3, "\t%ju TODO:sctps_earlyfrstpidsck3\n");
+	p(sctps_earlyfrstpidsck4, "\t%ju TODO:sctps_earlyfrstpidsck4\n");
+	p(sctps_earlyfrstrid, "\t%ju TODO:sctps_earlyfrstrid\n");
+	p(sctps_earlyfrstrout, "\t%ju TODO:sctps_earlyfrstrout\n");
+	p(sctps_earlyfrstrtmr, "\t%ju TODO:sctps_earlyfrstrtmr\n");
 #endif
 
 	/*
 	 * Others
 	 */
-	p(sctps_hdrops, "\t%ju packet %shorter than header\n");
-	p(sctps_badsum, "\t%ju check%sum error\n");
+	p1a(sctps_hdrops, "\t%ju packet shorter than header\n");
+	p1a(sctps_badsum, "\t%ju checksum error\n");
 	p1a(sctps_noport, "\t%ju no endpoint for port\n");
 	p1a(sctps_badvtag, "\t%ju bad v-tag\n");
 	p1a(sctps_badsid, "\t%ju bad SID\n");
@@ -641,14 +641,14 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	p1a(sctps_fastretransinrtt, "\t%ju number of multiple FR in a RTT "
 	    "window\n");
 #if 0
-	p(sctps_markedretrans, "\t%ju TODO:%sctps_markedretrans\n");
+	p(sctps_markedretrans, "\t%ju TODO:sctps_markedretrans\n");
 #endif
-	p(sctps_naglesent, "\t%ju RFC813 allowed %sending\n");
-	p(sctps_naglequeued, "\t%ju RFC813 doe%s not allow sending\n");
-	p(sctps_maxburstqueued, "\t%ju max bur%st dosn't allow sending\n");
-	p(sctps_ifnomemqueued, "\t%ju look ahead tell%s us no memory in "
+	p1a(sctps_naglesent, "\t%ju RFC813 allowed sending\n");
+	p1a(sctps_naglequeued, "\t%ju RFC813 does not allow sending\n");
+	p1a(sctps_maxburstqueued, "\t%ju max burst dosn't allow sending\n");
+	p1a(sctps_ifnomemqueued, "\t%ju look ahead tells us no memory in "
 	    "interface\n");
-	p(sctps_windowprobed, "\t%ju numbers of window probe%s sent\n");
+	p(sctps_windowprobed, "\t%ju number%s of window probes sent\n");
 	p(sctps_lowlevelerr, "\t%ju time%s an output error to clamp "
 	    "down on next user send.\n");
 	p(sctps_lowlevelerrusr, "\t%ju time%s sctp_senderrors were "
@@ -659,28 +659,28 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	    "limit reached\n");
 	p(sctps_ecnereducedcwnd, "\t%ju time%s a ECN reduced "
 	    "the cwnd\n");
-	p(sctps_vtagexpress, "\t%ju u%sed express lookup via vtag\n");
-	p(sctps_vtagbogus, "\t%ju colli%sion in express lookup.\n");
+	p1a(sctps_vtagexpress, "\t%ju used express lookup via vtag\n");
+	p1a(sctps_vtagbogus, "\t%ju collision in express lookup.\n");
 	p(sctps_primary_randry, "\t%ju time%s the sender ran dry "
 	    "of user data on primary\n");
 	p1a(sctps_cmt_randry, "\t%ju same for above\n");
 	p(sctps_slowpath_sack, "\t%ju sack%s the slow way\n");
-	p(sctps_wu_sacks_sent, "\t%ju window update only %sacks sent\n");
-	p(sctps_sends_with_flags, "\t%ju %sends with sinfo_flags !=0\n");
-	p(sctps_sends_with_unord, "\t%ju unordered %sends\n");
-	p(sctps_sends_with_eof, "\t%ju %sends with EOF flag set\n");
-	p(sctps_sends_with_abort, "\t%ju %sends with ABORT flag set\n");
+	p(sctps_wu_sacks_sent, "\t%ju window update only sack%s sent\n");
+	p(sctps_sends_with_flags, "\t%ju send%s with sinfo_flags !=0\n");
+	p(sctps_sends_with_unord, "\t%ju unordered send%s\n");
+	p(sctps_sends_with_eof, "\t%ju send%s with EOF flag set\n");
+	p(sctps_sends_with_abort, "\t%ju send%s with ABORT flag set\n");
 	p(sctps_protocol_drain_calls, "\t%ju time%s protocol drain called\n");
 	p(sctps_protocol_drains_done, "\t%ju time%s we did a protocol "
 	    "drain\n");
 	p(sctps_read_peeks, "\t%ju time%s recv was called with peek\n");
 	p(sctps_cached_chk, "\t%ju cached chunk%s used\n");
-	p(sctps_cached_strmoq, "\t%ju cached %stream oq's used\n");
-	p(sctps_left_abandon, "\t%ju unread me%ssage abandonded by close\n");
-	p(sctps_send_burst_avoid, "\t%ju send bur%st avoidance, already "
+	p1a(sctps_cached_strmoq, "\t%ju cached stream oq's used\n");
+	p(sctps_left_abandon, "\t%ju unread message%s abandonded by close\n");
+	p1a(sctps_send_burst_avoid, "\t%ju send burst avoidance, already "
+	    "max burst inflight to net\n");
+	p1a(sctps_send_cwnd_avoid, "\t%ju send cwnd full avoidance, already "
 	    "max burst inflight to net\n");
-	p(sctps_send_cwnd_avoid, "\t%ju send cwnd full avoidance, already "
-	    "max bur%st inflight to net\n");
 	p(sctps_fwdtsn_map_over, "\t%ju number of map array over-run%s via "
 	    "fwd-tsn's\n");