From: fenner <fenner>
Date: Tue, 18 Sep 2001 15:46:36 +0000 (+0000)
Subject: const-ify print-fddi and print-token, inspired by
X-Git-Tag: tcpdump-3.7.1~93
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c78c9612210bbe0d104e66258246ed47551d9969

const-ify print-fddi and print-token, inspired by
 Motonori Shindo <mshindo@mshindo.net>
---

diff --git a/print-fddi.c b/print-fddi.c
index caa1f11f..c1e3e208 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.51 2001-07-04 22:03:14 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.52 2001-09-18 15:46:36 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -210,8 +210,8 @@ extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
 			fsrc[i] = fddi_bit_swap[fddip->fddi_shost[i]];
 	}
 	else {
-		memcpy(fdst, (char *)fddip->fddi_dhost, 6);
-		memcpy(fsrc, (char *)fddip->fddi_shost, 6);
+		memcpy(fdst, (const char *)fddip->fddi_dhost, 6);
+		memcpy(fsrc, (const char *)fddip->fddi_shost, 6);
 	}
 }
 
@@ -222,7 +222,7 @@ static inline void
 fddi_print(register const struct fddi_header *fddip, register u_int length,
 	   register const u_char *fsrc, register const u_char *fdst)
 {
-	char *srcname, *dstname;
+	const char *srcname, *dstname;
 
 	srcname = etheraddr_string(fsrc);
 	dstname = etheraddr_string(fdst);
@@ -258,7 +258,7 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
 {
 	u_int caplen = h->caplen;
 	u_int length = h->len;
-	const struct fddi_header *fddip = (struct fddi_header *)p;
+	const struct fddi_header *fddip = (const struct fddi_header *)p;
 	struct ether_header ehdr;
 	u_short extracted_ethertype;
 
diff --git a/print-token.c b/print-token.c
index dd4e2c9f..0d0b23a6 100644
--- a/print-token.c
+++ b/print-token.c
@@ -25,7 +25,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.12 2001-07-04 22:03:14 fenner Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.13 2001-09-18 15:46:37 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -53,8 +53,8 @@ static const char rcsid[] =
 static inline void
 extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 {
-	memcpy(fdst, (char *)trp->token_dhost, 6);
-	memcpy(fsrc, (char *)trp->token_shost, 6);
+	memcpy(fdst, (const char *)trp->token_dhost, 6);
+	memcpy(fsrc, (const char *)trp->token_shost, 6);
 }
 
 /*
@@ -64,7 +64,7 @@ static inline void
 token_print(register const struct token_header *trp, register u_int length,
 	   register const u_char *fsrc, register const u_char *fdst)
 {
-	char *srcname, *dstname;
+	const char *srcname, *dstname;
 
 	srcname = etheraddr_string(fsrc);
 	dstname = etheraddr_string(fdst);
@@ -79,18 +79,18 @@ token_print(register const struct token_header *trp, register u_int length,
 		printf("%s %s %d: ", srcname, dstname, length);
 }
 
-static char *broadcast_indicator[] = {
+static const char *broadcast_indicator[] = {
 	"Non-Broadcast", "Non-Broadcast",
 	"Non-Broadcast", "Non-Broadcast",
 	"All-routes",    "All-routes",
 	"Single-route",  "Single-route"
 };
 
-static char *direction[] = {
+static const char *direction[] = {
 	"Forward", "Backward"
 };
 
-static char *largest_frame[] = {
+static const char *largest_frame[] = {
 	"516",
 	"1500",
 	"2052",
@@ -112,12 +112,12 @@ token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int caplen = h->caplen;
 	u_int length = h->len;
-	struct token_header *trp;
+	const struct token_header *trp;
 	u_short extracted_ethertype;
 	struct ether_header ehdr;
 	u_int route_len = 0, seg;
 
-	trp = (struct token_header *)p;
+	trp = (const struct token_header *)p;
 
 	++infodelay;
 	ts_print(&h->ts);