From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sat, 9 Jan 2021 13:07:53 +0000 (+0100)
Subject: Remove the no more used nd_print() function
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/f867bc9f40b4ce00e08fa6377bbb7d74719b9313

Remove the no more used nd_print() function

The function to use now is: nd_printjnp().
(Added by commit 635e3cc92b72ca048a6b5b89b883980e4e1b4bdc)
---

diff --git a/netdissect.h b/netdissect.h
index 44d4df0f..96b6c0e7 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -391,7 +391,6 @@ extern void unsigned_relts_print(netdissect_options *, uint32_t);
 
 extern void fn_print_char(netdissect_options *, u_char);
 extern void fn_print_str(netdissect_options *, const u_char *);
-extern int nd_print(netdissect_options *, const u_char *, const u_char *);
 extern u_int nd_printztn(netdissect_options *, const u_char *, u_int, const u_char *);
 extern int nd_printn(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void nd_printjn(netdissect_options *, const u_char *, u_int);
diff --git a/util-print.c b/util-print.c
index 5424c20e..925cf8d6 100644
--- a/util-print.c
+++ b/util-print.c
@@ -94,33 +94,6 @@ fn_print_str(netdissect_options *ndo, const u_char *s)
        }
 }
 
-/*
- * Print out a null-terminated filename (or other ASCII string), part of
- * the packet buffer.
- * If ep is NULL, assume no truncation check is needed.
- * Return true if truncated.
- * Stop at ep (if given) or before the null char, whichever is first.
- */
-int
-nd_print(netdissect_options *ndo,
-         const u_char *s, const u_char *ep)
-{
-	int ret;
-	u_char c;
-
-	ret = 1;			/* assume truncated */
-	while (ep == NULL || s < ep) {
-		c = GET_U_1(s);
-		s++;
-		if (c == '\0') {
-			ret = 0;
-			break;
-		}
-		fn_print_char(ndo, c);
-	}
-	return(ret);
-}
-
 /*
  * Print out a null-terminated filename (or other ASCII string) from
  * a fixed-length field in the packet buffer, or from what remains of