make use of ND_DEFAULTPRINT()

21 files changed, 29 insertions, 29 deletions

diff --git a/print-802_15_4.c b/print-802_15_4.c
index ee66832f..0e10e68d 100644
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -174,7 +174,7 @@ ieee802_15_4_if_print(struct netdissect_options *ndo,
 	}
 
 	if (!ndo->ndo_suppress_default_print)
-		(ndo->ndo_default_print)(ndo, p, caplen);
+		ND_DEFAULTPRINT(p, caplen);
 
 	return 0;
 }
diff --git a/print-ap1394.c b/print-ap1394.c
index 41588a80..3ce31b1c 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -106,7 +106,7 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 			ap1394_hdr_print(ndo, (u_char *)fp, length + FIREWIRE_HDRLEN);
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 
 	return FIREWIRE_HDRLEN;
diff --git a/print-arcnet.c b/print-arcnet.c
index 666b3115..640d31be 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -243,7 +243,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 	}
 
 	if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
-		ndo->ndo_default_print(ndo, p, caplen);
+		ND_DEFAULTPRINT(p, caplen);
 
 	return (archdrlen);
 }
@@ -302,7 +302,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
 	p += archdrlen;
 
 	if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
-		ndo->ndo_default_print(ndo, p, caplen);
+		ND_DEFAULTPRINT(p, caplen);
 
 	return (archdrlen);
 }
diff --git a/print-atm.c b/print-atm.c
index adba71ad..b1229571 100644
--- a/print-atm.c
+++ b/print-atm.c
@@ -140,7 +140,7 @@ atm_llc_print(netdissect_options *ndo,
 		etherproto_string(htons(extracted_ethertype))));
 		}
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 }
 
diff --git a/print-bt.c b/print-bt.c
index 7337047d..128daade 100644
--- a/print-bt.c
+++ b/print-bt.c
@@ -55,7 +55,7 @@ bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *
 		ND_PRINT((ndo, "hci length %d, direction %s, ", length, (EXTRACT_32BITS(&hdr->direction)&0x1)?"in":"out"));
 
 	if (!ndo->ndo_suppress_default_print)
-		ndo->ndo_default_print(ndo, p, caplen);
+		ND_DEFAULTPRINT(p, caplen);
 
 	return (BT_HDRLEN);
 }
diff --git a/print-calm-fast.c b/print-calm-fast.c
index 351b6b8d..324a118c 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -48,7 +48,7 @@ calm_fast_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_
 	ND_PRINT((ndo, "DstNwref:%d; ", dstNwref));
 
 	if (ndo->ndo_vflag)
-		ndo->ndo_default_print(ndo, bp, length);
+		ND_DEFAULTPRINT(bp, length);
 }
 
 
diff --git a/print-cip.c b/print-cip.c
index f8b48ec2..91abe08d 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -86,7 +86,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 			       etherproto_string(htons(extracted_ethertype))));
 			}
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	} else {
 		/*
diff --git a/print-ether.c b/print-ether.c
index 09b9baba..efbb8cfd 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -166,7 +166,7 @@ recurse:
 			}
 
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	} else if (ether_type == ETHERTYPE_8021Q  ||
                 ether_type == ETHERTYPE_8021Q9100 ||
@@ -217,7 +217,7 @@ recurse:
 			}
 
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	} else {
 		if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
@@ -229,7 +229,7 @@ recurse:
 			}
 
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
 }
diff --git a/print-fddi.c b/print-fddi.c
index e79ab98f..413a6efb 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -320,7 +320,7 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 			etherproto_string(htons(extracted_ethertype))));
 			}
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	} else if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_SMT)
 		fddi_smt_print(ndo, p, caplen);
@@ -330,7 +330,7 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 			fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN, ESRC(&ehdr),
 			    EDST(&ehdr));
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 }
 
diff --git a/print-fr.c b/print-fr.c
index c8e67bd1..6111c506 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -300,7 +300,7 @@ fr_print(netdissect_options *ndo,
                             fr_hdr_print(ndo, length + hdr_len, hdr_len,
                                          dlci, flags, nlpid);
 			if (!ndo->ndo_suppress_default_print)
-                            ndo->ndo_default_print(ndo, p - hdr_len, length + hdr_len);
+				ND_DEFAULTPRINT(p - hdr_len, length + hdr_len);
 		}
 		break;
 
@@ -321,7 +321,7 @@ fr_print(netdissect_options *ndo,
                     fr_hdr_print(ndo, length + hdr_len, addr_len,
 				     dlci, flags, nlpid);
 		if (!ndo->ndo_xflag)
-			ndo->ndo_default_print(ndo, p, length);
+			ND_DEFAULTPRINT(p, length);
 	}
 
 	return hdr_len;
diff --git a/print-geonet.c b/print-geonet.c
index cba77c71..229b2540 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -235,7 +235,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
 
 	/* Print user data part */
 	if (ndo->ndo_vflag)
-		ndo->ndo_default_print(ndo, bp, length);
+		ND_DEFAULTPRINT(bp, length);
 }
 
 
diff --git a/print-ipfc.c b/print-ipfc.c
index 7a7b6f93..4b397d1f 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -116,7 +116,7 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 		etherproto_string(htons(extracted_ethertype))));
 		}
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 }
 
diff --git a/print-ipnet.c b/print-ipnet.c
index d777a952..9f11f392 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -88,7 +88,7 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
 					length + sizeof(ipnet_hdr_t));
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 		break;
 	}
 }
diff --git a/print-mpls.c b/print-mpls.c
index 21b7ba46..1220028f 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -175,7 +175,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	 */
 	if (pt == PT_UNKNOWN) {
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, length - (p - bp));
+			ND_DEFAULTPRINT(p, length - (p - bp));
 		return;
 	}
 	ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " "));
diff --git a/print-nflog.c b/print-nflog.c
index 5985799e..29d23b62 100644
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -155,7 +155,7 @@ nflog_if_print(struct netdissect_options *ndo,
 				length + sizeof(nflog_hdr_t));
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 		break;
 	}
 
diff --git a/print-null.c b/print-null.c
index f1af5440..f0ad6617 100644
--- a/print-null.c
+++ b/print-null.c
@@ -134,7 +134,7 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		if (!ndo->ndo_eflag)
 			null_hdr_print(ndo, family, length + NULL_HDRLEN);
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 
 	return (NULL_HDRLEN);
diff --git a/print-pflog.c b/print-pflog.c
index 07f0732f..a2fba179 100644
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -166,7 +166,7 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		if (!ndo->ndo_eflag)
 			pflog_print(ndo, hdr);
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 
 	return (hdrlen);
diff --git a/print-ppi.c b/print-ppi.c
index 720142df..f2a6dad9 100644
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -80,7 +80,7 @@ ppi_print(struct netdissect_options *ndo,
 					length + sizeof(ppi_header_t));
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 }
 
diff --git a/print-sll.c b/print-sll.c
index 6eda8195..82bb4d63 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -265,7 +265,7 @@ recurse:
 			       etherproto_string(htons(extracted_ethertype))));
 			}
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 			break;
 		}
 	} else if (ether_type == ETHERTYPE_8021Q) {
@@ -303,7 +303,7 @@ recurse:
 			if (!ndo->ndo_eflag)
 				sll_print(ndo, sllp, length + SLL_HDR_LEN);
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
 
diff --git a/print-symantec.c b/print-symantec.c
index 631c7d96..39d8b651 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -99,14 +99,14 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
 			symantec_hdr_print(ndo, (u_char *)sp, length + sizeof (struct symantec_header));
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	} else if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
 		/* ether_type not known, print raw packet */
 		if (!ndo->ndo_eflag)
 			symantec_hdr_print(ndo, (u_char *)sp, length + sizeof (struct symantec_header));
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 
 	return (sizeof (struct symantec_header));
diff --git a/print-token.c b/print-token.c
index 18a461b7..3aba5bcf 100644
--- a/print-token.c
+++ b/print-token.c
@@ -223,7 +223,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 			etherproto_string(htons(extracted_ethertype))));
 			}
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	} else {
 		/* Some kinds of TR packet we cannot handle intelligently */
@@ -232,7 +232,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 			token_hdr_print(ndo, trp, length + TOKEN_HDRLEN + route_len,
 			    ESRC(&ehdr), EDST(&ehdr));
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 	return (hdr_len);
 }