From: Denis Ovsienko <infrastation@yandex.ru>
Date: Wed, 2 Apr 2014 14:55:24 +0000 (+0400)
Subject: convert some stray printf()'s
X-Git-Tag: tcpdump-4.6.0~113
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/779bcfb73addf223ee78104af297ab794c1d008e

convert some stray printf()'s
---

diff --git a/print-ntp.c b/print-ntp.c
index 367d9fe5..5dd0e240 100644
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -215,21 +215,21 @@ ntp_print(netdissect_options *ndo,
 	ND_PRINT((ndo, "NTPv%d", version));
 
 	mode = bp->status & MODEMASK;
-        if (!ndo->ndo_vflag) {
-            printf (", %s, length %u",
-                    tok2str(ntp_mode_values, "Unknown mode", mode),
-                    length);
-            return;
-        }
+	if (!ndo->ndo_vflag) {
+		ND_PRINT((ndo, ", %s, length %u",
+		          tok2str(ntp_mode_values, "Unknown mode", mode),
+		          length));
+		return;
+	}
 
-        printf (", length %u\n\t%s",
-                length,
-                tok2str(ntp_mode_values, "Unknown mode", mode));
+	ND_PRINT((ndo, ", length %u\n\t%s",
+	          length,
+	          tok2str(ntp_mode_values, "Unknown mode", mode)));
 
 	leapind = bp->status & LEAPMASK;
-        printf (", Leap indicator: %s (%u)",
-                tok2str(ntp_leapind_values, "Unknown", leapind),
-                leapind);
+	ND_PRINT((ndo, ", Leap indicator: %s (%u)",
+	          tok2str(ntp_leapind_values, "Unknown", leapind),
+	          leapind));
 
 	ND_TCHECK(bp->stratum);
 	ND_PRINT((ndo, ", Stratum %u (%s)",
@@ -367,7 +367,7 @@ p_ntp_time(netdissect_options *ndo,
 
 	    tm = localtime(&seconds);
 	    strftime(time_buf, sizeof (time_buf), "%Y/%m/%d %H:%M:%S", tm);
-	    printf (" (%s)", time_buf);
+	    ND_PRINT((ndo, " (%s)", time_buf));
 	}
 #endif
 }
diff --git a/print-olsr.c b/print-olsr.c
index 3073a8a8..e8c282c9 100644
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -503,12 +503,8 @@ olsr_print(netdissect_options *ndo,
                     ptr.hna = (struct olsr_hna4 *)msg_data;
 
                     /* print 4 prefixes per line */
-                    if (col == 0)
-                        printf ("\n\t    ");
-                    else
-                        printf (", ");
-
-                    ND_PRINT((ndo, "%s/%u",
+                    ND_PRINT((ndo, "%s%s/%u",
+                            col == 0 ? "\n\t    " : ", ",
                             ipaddr_string(ptr.hna->network),
                             mask2plen(EXTRACT_32BITS(ptr.hna->mask))));
 
diff --git a/print-pppoe.c b/print-pppoe.c
index a59e141c..d8edc496 100644
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -97,7 +97,7 @@ pppoe_print(netdissect_options *ndo, register const u_char *bp, u_int length)
 	const u_char *pppoe_packet, *pppoe_payload;
 
 	if (length < PPPOE_HDRLEN) {
-		(void)printf("truncated-pppoe %u", length);
+		ND_PRINT((ndo, "truncated-pppoe %u", length));
 		return (length);
 	}
 	length -= PPPOE_HDRLEN;
diff --git a/print-sl.c b/print-sl.c
index 31a9c5ef..a12a2bd6 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -84,7 +84,7 @@ sl_if_print(netdissect_options *ndo,
 		break;
 #endif
 	default:
-		printf ("ip v%d", IP_V(ip));
+		ND_PRINT((ndo, "ip v%d", IP_V(ip)));
 	}
 
 	return (SLIP_HDRLEN);