From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Fri, 8 Apr 2022 13:34:17 +0000 (+0200)
Subject: Add some const qualifiers
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/857656d29151f99a1c5de50a0c7574c3cf786241

Add some const qualifiers

Moreover:
Fix indentation.
---

diff --git a/util-print.c b/util-print.c
index bd39d56a..f5a7c622 100644
--- a/util-print.c
+++ b/util-print.c
@@ -472,7 +472,7 @@ print_unknown_data(netdissect_options *ndo, const u_char *cp,
  */
 static const char *
 tok2strbuf(const struct tok *lp, const char *fmt,
-	   u_int v, char *buf, size_t bufsize)
+	   const u_int v, char *buf, const size_t bufsize)
 {
 	if (lp != NULL) {
 		while (lp->s != NULL) {
@@ -494,8 +494,7 @@ tok2strbuf(const struct tok *lp, const char *fmt,
  * in round-robin fashion.
  */
 const char *
-tok2str(const struct tok *lp, const char *fmt,
-	u_int v)
+tok2str(const struct tok *lp, const char *fmt, const u_int v)
 {
 	static char buf[4][TOKBUFSIZE];
 	static int idx = 0;
@@ -516,7 +515,7 @@ tok2str(const struct tok *lp, const char *fmt,
  */
 static char *
 bittok2str_internal(const struct tok *lp, const char *fmt,
-	   u_int v, const char *sep)
+		    const u_int v, const char *sep)
 {
         static char buf[1024+1]; /* our string buffer */
         char *bufp = buf;
@@ -556,8 +555,7 @@ bittok2str_internal(const struct tok *lp, const char *fmt,
  * this is useful for parsing bitfields, the output strings are not separated.
  */
 char *
-bittok2str_nosep(const struct tok *lp, const char *fmt,
-	   u_int v)
+bittok2str_nosep(const struct tok *lp, const char *fmt, const u_int v)
 {
     return (bittok2str_internal(lp, fmt, v, ""));
 }
@@ -567,8 +565,7 @@ bittok2str_nosep(const struct tok *lp, const char *fmt,
  * this is useful for parsing bitfields, the output strings are comma separated.
  */
 char *
-bittok2str(const struct tok *lp, const char *fmt,
-	   u_int v)
+bittok2str(const struct tok *lp, const char *fmt, const u_int v)
 {
     return (bittok2str_internal(lp, fmt, v, ", "));
 }
@@ -580,8 +577,7 @@ bittok2str(const struct tok *lp, const char *fmt,
  * correct for bounds-checking.
  */
 const char *
-tok2strary_internal(const char **lp, int n, const char *fmt,
-	int v)
+tok2strary_internal(const char **lp, int n, const char *fmt, const int v)
 {
 	static char buf[TOKBUFSIZE];
 
@@ -614,7 +610,7 @@ uint2tokary_internal(const struct uint_tokary dict[], const size_t size,
  */
 
 int
-mask2plen(uint32_t mask)
+mask2plen(const uint32_t mask)
 {
 	const uint32_t bitmasks[33] = {
 		0x00000000,
@@ -682,7 +678,7 @@ mask62plen(const u_char *mask)
  */
 static int
 fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len,
-    u_char *tbuf, size_t tbuflen)
+	    u_char *tbuf, size_t tbuflen)
 {
 	size_t toklen = 0;
 	u_char c;