spell "%s" format strings (complements 708a68a)

Make "%s" format string always reside in the print function call
explicitly such that the reader doesn't have to assess its safety.

6 files changed, 16 insertions, 16 deletions

diff --git a/print-atalk.c b/print-atalk.c
index 00f9dac4..732e6112 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -254,7 +254,7 @@ atp_print(netdissect_options *ndo,
 
 	if ((const u_char *)(ap + 1) > ndo->ndo_snapend) {
 		/* Just bail if we don't have the whole chunk. */
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 	if (length < sizeof(*ap)) {
@@ -398,7 +398,7 @@ nbp_print(netdissect_options *ndo,
 	/* ep points to end of available data */
 	ep = ndo->ndo_snapend;
 	if ((const u_char *)tp > ep) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 	switch (i = np->control & 0xf0) {
@@ -407,7 +407,7 @@ nbp_print(netdissect_options *ndo,
 	case nbpLkUp:
 		ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %d:":" nbp-brRq %d:", np->id));
 		if ((const u_char *)(tp + 1) > ep) {
-			ND_PRINT((ndo, tstr));
+			ND_PRINT((ndo, "%s", tstr));
 			return;
 		}
 		(void)nbp_name_print(ndo, tp, ep);
@@ -449,7 +449,7 @@ print_cstring(netdissect_options *ndo,
 	register u_int length;
 
 	if (cp >= (const char *)ep) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return (0);
 	}
 	length = *cp++;
@@ -461,7 +461,7 @@ print_cstring(netdissect_options *ndo,
 	}
 	while ((int)--length >= 0) {
 		if (cp >= (const char *)ep) {
-			ND_PRINT((ndo, tstr));
+			ND_PRINT((ndo, "%s", tstr));
 			return (0);
 		}
 		ND_PRINT((ndo, "%c", *cp++));
@@ -477,7 +477,7 @@ nbp_tuple_print(netdissect_options *ndo,
 	register const struct atNBPtuple *tpn;
 
 	if ((const u_char *)(tp + 1) > ep) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return 0;
 	}
 	tpn = nbp_name_print(ndo, tp, ep);
diff --git a/print-bootp.c b/print-bootp.c
index f41f2ea8..10333700 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -167,7 +167,7 @@ bootp_print(netdissect_options *ndo,
 
 	return;
 trunc:
-	ND_PRINT((ndo, tstr));
+	ND_PRINT((ndo, "%s", tstr));
 }
 
 /*
@@ -799,7 +799,7 @@ cmu_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT((ndo, tstr));
+	ND_PRINT((ndo, "%s", tstr));
 #undef PRINTCMUADDR
 }
 
diff --git a/print-krb.c b/print-krb.c
index e726cee9..bcc81bf1 100644
--- a/print-krb.c
+++ b/print-krb.c
@@ -137,7 +137,7 @@ krb4_print_hdr(netdissect_options *ndo,
 	return (cp);
 
 trunc:
-	ND_PRINT((ndo, tstr));
+	ND_PRINT((ndo, "%s", tstr));
 	return (NULL);
 
 #undef PRINT
@@ -159,7 +159,7 @@ krb4_print(netdissect_options *ndo,
 	kp = (struct krb *)cp;
 
 	if ((&kp->type) >= ndo->ndo_snapend) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 
@@ -218,7 +218,7 @@ krb4_print(netdissect_options *ndo,
 
 	return;
 trunc:
-	ND_PRINT((ndo, tstr));
+	ND_PRINT((ndo, "%s", tstr));
 }
 
 void
@@ -230,7 +230,7 @@ krb_print(netdissect_options *ndo,
 	kp = (struct krb *)dat;
 
 	if (dat >= ndo->ndo_snapend) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 
diff --git a/print-ospf6.c b/print-ospf6.c
index 98334afe..8fb42afb 100644
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -995,5 +995,5 @@ ospf6_print(netdissect_options *ndo,
 
 	return;
 trunc:
-	ND_PRINT((ndo, tstr));
+	ND_PRINT((ndo, "%s", tstr));
 }
diff --git a/print-tftp.c b/print-tftp.c
index 6324ea0e..5f47d476 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -180,6 +180,6 @@ tftp_print(netdissect_options *ndo,
 	}
 	return;
 trunc:
-	ND_PRINT((ndo, tstr));
+	ND_PRINT((ndo, "%s", tstr));
 	return;
 }
diff --git a/print-wb.c b/print-wb.c
index c0a4f5b5..14ce4450 100644
--- a/print-wb.c
+++ b/print-wb.c
@@ -332,7 +332,7 @@ wb_dops(netdissect_options *ndo,
 		}
 		dh = DOP_NEXT(dh);
 		if ((u_char *)dh > ndo->ndo_snapend) {
-			ND_PRINT((ndo, tstr));
+			ND_PRINT((ndo, "%s", tstr));
 			break;
 		}
 	}
@@ -398,7 +398,7 @@ wb_print(netdissect_options *ndo,
 
 	ph = (const struct pkt_hdr *)hdr;
 	if (len < sizeof(*ph) || (u_char *)(ph + 1) > ndo->ndo_snapend) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 	len -= sizeof(*ph);