From ad0c9114e00a9a30168e0c13c17d8f65571aa67f Mon Sep 17 00:00:00 2001 From: glebius Date: Fri, 10 Feb 2017 07:22:12 +0000 Subject: Merge r309649, r313048, r313083, r313104: tcpdump 4.9.0 --- contrib/tcpdump/cpack.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'contrib/tcpdump/cpack.h') diff --git a/contrib/tcpdump/cpack.h b/contrib/tcpdump/cpack.h index a7eb6d6..3072e0c 100644 --- a/contrib/tcpdump/cpack.h +++ b/contrib/tcpdump/cpack.h @@ -31,20 +31,20 @@ #define _CPACK_H struct cpack_state { - uint8_t *c_buf; - uint8_t *c_next; + const uint8_t *c_buf; + const uint8_t *c_next; size_t c_len; }; -int cpack_init(struct cpack_state *, uint8_t *, size_t); +int cpack_init(struct cpack_state *, const uint8_t *, size_t); int cpack_uint8(struct cpack_state *, uint8_t *); int cpack_uint16(struct cpack_state *, uint16_t *); int cpack_uint32(struct cpack_state *, uint32_t *); int cpack_uint64(struct cpack_state *, uint64_t *); -uint8_t *cpack_next_boundary(uint8_t *buf, uint8_t *p, size_t alignment); -uint8_t *cpack_align_and_reserve(struct cpack_state *cs, size_t wordsize); +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); #define cpack_int8(__s, __p) cpack_uint8((__s), (uint8_t*)(__p)) #define cpack_int16(__s, __p) cpack_uint16((__s), (uint16_t*)(__p)) -- cgit v1.1