From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sun, 8 Mar 2020 11:36:46 +0000 (+0100)
Subject: Ethernet: Rename a printer
X-Git-Tag: tcpdump-4.99-bp~485
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/19a7707e79c1b3191ada3725f69cfd6c640cfb5c

Ethernet: Rename a printer

Rename ether_print_switch_tag() to ether_switch_tag_print(), with _print
suffix like in most similar cases.
---

diff --git a/netdissect.h b/netdissect.h
index ba3b6b96..620c9a11 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -579,7 +579,7 @@ extern void egp_print(netdissect_options *, const u_char *, u_int);
 extern void eigrp_print(netdissect_options *, const u_char *, u_int);
 extern void esp_print(netdissect_options *, const u_char *, u_int, const u_char *, u_int, int, u_int);
 extern u_int ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *);
-extern u_int ether_print_switch_tag(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), u_int);
+extern u_int ether_switch_tag_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), u_int);
 extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
 extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void forces_print(netdissect_options *, const u_char *, u_int);
diff --git a/print-brcmtag.c b/print-brcmtag.c
index 15449786..ff9c5cb3 100644
--- a/print-brcmtag.c
+++ b/print-brcmtag.c
@@ -118,7 +118,7 @@ brcm_tag_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	u_int length = h->len;
 
 	ndo->ndo_protocol = "brcm-tag";
-	return (ether_print_switch_tag(ndo, p, length, caplen,
+	return (ether_switch_tag_print(ndo, p, length, caplen,
 	    brcm_tag_print, BRCM_TAG_LEN));
 }
 
diff --git a/print-dsa.c b/print-dsa.c
index 0efab602..7dad9e2a 100644
--- a/print-dsa.c
+++ b/print-dsa.c
@@ -203,7 +203,7 @@ dsa_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	u_int length = h->len;
 
 	ndo->ndo_protocol = "dsa";
-	return (ether_print_switch_tag(ndo, p, length, caplen,
+	return (ether_switch_tag_print(ndo, p, length, caplen,
 	    dsa_tag_print, DSA_LEN));
 }
 
@@ -214,6 +214,6 @@ edsa_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	u_int length = h->len;
 
 	ndo->ndo_protocol = "edsa";
-	return (ether_print_switch_tag(ndo, p, length, caplen,
+	return (ether_switch_tag_print(ndo, p, length, caplen,
 	    edsa_tag_print, EDSA_LEN));
 }
diff --git a/print-ether.c b/print-ether.c
index 74479ccf..eed66ace 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -375,7 +375,7 @@ recurse:
  * FIXME: caplen can and should be derived from ndo->ndo_snapend and p.
  */
 u_int
-ether_print_switch_tag(netdissect_options *ndo, const u_char *p, u_int length,
+ether_switch_tag_print(netdissect_options *ndo, const u_char *p, u_int length,
     u_int caplen,
     void (*print_switch_tag)(netdissect_options *, const u_char *),
     u_int switch_tag_len)