X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64e8f9a9ed91a3cbfa8e66367f87ef50a1d62b99..refs/pull/1034/head:/cpack.c

diff --git a/cpack.c b/cpack.c
index db3b6dc2..9be7b47d 100644
--- a/cpack.c
+++ b/cpack.c
@@ -41,7 +41,7 @@
 #include "cpack.h"
 
 const uint8_t *
-cpack_next_boundary(const uint8_t *buf, const uint8_t *p, size_t alignment)
+nd_cpack_next_boundary(const uint8_t *buf, const uint8_t *p, size_t alignment)
 {
 	size_t misalignment = (size_t)(p - buf) % alignment;
 
@@ -56,12 +56,12 @@ cpack_next_boundary(const uint8_t *buf, const uint8_t *p, size_t alignment)
  * return a pointer to the boundary.
  */
 const uint8_t *
-cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
+nd_cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
 {
 	const uint8_t *next;
 
 	/* Ensure alignment. */
-	next = cpack_next_boundary(cs->c_buf, cs->c_next, wordsize);
+	next = nd_cpack_next_boundary(cs->c_buf, cs->c_next, wordsize);
 
 	/* Too little space for wordsize bytes? */
 	if (next - cs->c_buf + wordsize > cs->c_len)
@@ -72,7 +72,7 @@ cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize)
 
 /* Advance by N bytes without returning them. */
 int
-cpack_advance(struct cpack_state *cs, const size_t toskip)
+nd_cpack_advance(struct cpack_state *cs, const size_t toskip)
 {
 	/* No space left? */
 	if (cs->c_next - cs->c_buf + toskip > cs->c_len)
@@ -82,7 +82,7 @@ cpack_advance(struct cpack_state *cs, const size_t toskip)
 }
 
 int
-cpack_init(struct cpack_state *cs, const uint8_t *buf, size_t buflen)
+nd_cpack_init(struct cpack_state *cs, const uint8_t *buf, size_t buflen)
 {
 	memset(cs, 0, sizeof(*cs));
 
@@ -95,11 +95,11 @@ cpack_init(struct cpack_state *cs, const uint8_t *buf, size_t buflen)
 
 /* Unpack a 64-bit unsigned integer. */
 int
-cpack_uint64(netdissect_options *ndo, struct cpack_state *cs, uint64_t *u)
+nd_cpack_uint64(netdissect_options *ndo, struct cpack_state *cs, uint64_t *u)
 {
 	const uint8_t *next;
 
-	if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+	if ((next = nd_cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
 		return -1;
 
 	*u = GET_LE_U_8(next);
@@ -111,11 +111,11 @@ cpack_uint64(netdissect_options *ndo, struct cpack_state *cs, uint64_t *u)
 
 /* Unpack a 64-bit signed integer. */
 int
-cpack_int64(netdissect_options *ndo, struct cpack_state *cs, int64_t *u)
+nd_cpack_int64(netdissect_options *ndo, struct cpack_state *cs, int64_t *u)
 {
 	const uint8_t *next;
 
-	if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+	if ((next = nd_cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
 		return -1;
 
 	*u = GET_LE_S_8(next);
@@ -127,11 +127,11 @@ cpack_int64(netdissect_options *ndo, struct cpack_state *cs, int64_t *u)
 
 /* Unpack a 32-bit unsigned integer. */
 int
-cpack_uint32(netdissect_options *ndo, struct cpack_state *cs, uint32_t *u)
+nd_cpack_uint32(netdissect_options *ndo, struct cpack_state *cs, uint32_t *u)
 {
 	const uint8_t *next;
 
-	if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+	if ((next = nd_cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
 		return -1;
 
 	*u = GET_LE_U_4(next);
@@ -143,11 +143,11 @@ cpack_uint32(netdissect_options *ndo, struct cpack_state *cs, uint32_t *u)
 
 /* Unpack a 32-bit signed integer. */
 int
-cpack_int32(netdissect_options *ndo, struct cpack_state *cs, int32_t *u)
+nd_cpack_int32(netdissect_options *ndo, struct cpack_state *cs, int32_t *u)
 {
 	const uint8_t *next;
 
-	if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+	if ((next = nd_cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
 		return -1;
 
 	*u = GET_LE_S_4(next);
@@ -159,11 +159,11 @@ cpack_int32(netdissect_options *ndo, struct cpack_state *cs, int32_t *u)
 
 /* Unpack a 16-bit unsigned integer. */
 int
-cpack_uint16(netdissect_options *ndo, struct cpack_state *cs, uint16_t *u)
+nd_cpack_uint16(netdissect_options *ndo, struct cpack_state *cs, uint16_t *u)
 {
 	const uint8_t *next;
 
-	if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+	if ((next = nd_cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
 		return -1;
 
 	*u = GET_LE_U_2(next);
@@ -175,11 +175,11 @@ cpack_uint16(netdissect_options *ndo, struct cpack_state *cs, uint16_t *u)
 
 /* Unpack a 16-bit signed integer. */
 int
-cpack_int16(netdissect_options *ndo, struct cpack_state *cs, int16_t *u)
+nd_cpack_int16(netdissect_options *ndo, struct cpack_state *cs, int16_t *u)
 {
 	const uint8_t *next;
 
-	if ((next = cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
+	if ((next = nd_cpack_align_and_reserve(cs, sizeof(*u))) == NULL)
 		return -1;
 
 	*u = GET_LE_S_2(next);
@@ -191,7 +191,7 @@ cpack_int16(netdissect_options *ndo, struct cpack_state *cs, int16_t *u)
 
 /* Unpack an 8-bit unsigned integer. */
 int
-cpack_uint8(netdissect_options *ndo, struct cpack_state *cs, uint8_t *u)
+nd_cpack_uint8(netdissect_options *ndo, struct cpack_state *cs, uint8_t *u)
 {
 	/* No space left? */
 	if ((size_t)(cs->c_next - cs->c_buf) >= cs->c_len)
@@ -206,7 +206,7 @@ cpack_uint8(netdissect_options *ndo, struct cpack_state *cs, uint8_t *u)
 
 /* Unpack an 8-bit signed integer. */
 int
-cpack_int8(netdissect_options *ndo, struct cpack_state *cs, int8_t *u)
+nd_cpack_int8(netdissect_options *ndo, struct cpack_state *cs, int8_t *u)
 {
 	/* No space left? */
 	if ((size_t)(cs->c_next - cs->c_buf) >= cs->c_len)