X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/feb50f848364f748a2d5f31f9e65d50df37a0bcf..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/cpack.h

diff --git a/cpack.h b/cpack.h
index 383927f7..b9a37850 100644
--- a/cpack.h
+++ b/cpack.h
@@ -31,25 +31,24 @@
 #define _CPACK_H
 
 struct cpack_state {
-	u_int8_t					*c_buf;
-	u_int8_t					*c_next;
+	const uint8_t					*c_buf;
+	const uint8_t					*c_next;
 	size_t						 c_len;
 };
 
-int cpack_init(struct cpack_state *, u_int8_t *, size_t);
+int cpack_init(struct cpack_state *, const uint8_t *, size_t);
 
-int cpack_uint8(struct cpack_state *, u_int8_t *);
-int cpack_uint16(struct cpack_state *, u_int16_t *);
-int cpack_uint32(struct cpack_state *, u_int32_t *);
-int cpack_uint64(struct cpack_state *, u_int64_t *);
+int cpack_uint8(struct cpack_state *, uint8_t *);
+int cpack_int8(struct cpack_state *, int8_t *);
+int cpack_uint16(struct cpack_state *, uint16_t *);
+int cpack_int16(struct cpack_state *, int16_t *);
+int cpack_uint32(struct cpack_state *, uint32_t *);
+int cpack_int32(struct cpack_state *, int32_t *);
+int cpack_uint64(struct cpack_state *, uint64_t *);
+int cpack_int64(struct cpack_state *, int64_t *);
 
-u_int8_t *cpack_next_boundary(u_int8_t *buf, u_int8_t *p, size_t alignment);
-u_int8_t *cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize);
-
-#define cpack_int8(__s, __p)	cpack_uint8((__s),  (u_int8_t*)(__p))
-#define cpack_int16(__s, __p)	cpack_uint16((__s), (u_int16_t*)(__p))
-#define cpack_int32(__s, __p)	cpack_uint32((__s), (u_int32_t*)(__p))
-#define cpack_int64(__s, __p)	cpack_uint64((__s), (u_int64_t*)(__p))
+const uint8_t *cpack_next_boundary(const uint8_t *buf, const uint8_t *p, size_t alignment);
+const uint8_t *cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize);
 
 extern int cpack_advance(struct cpack_state *, const size_t);