Revert partially the commit 21b1273

[tcpdump] / cpack.h

diff --git a/cpack.h b/cpack.h
index 3072e0c37411b28cc3854624e616ffb038681b22..6e709778a09b29ef2dc80d5288650e74ee8fe5dd 100644 (file)
--- a/cpack.h
+++ b/cpack.h
@@ -30,6 +30,8 @@
 #ifndef _CPACK_H
 #define _CPACK_H
 
+#include "netdissect.h"
+
 struct cpack_state {
        const uint8_t                                   *c_buf;
        const uint8_t                                   *c_next;
@@ -38,19 +40,18 @@ struct cpack_state {
 
 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 *);
+int cpack_uint8(netdissect_options *, struct cpack_state *, uint8_t *);
+int cpack_int8(netdissect_options *, struct cpack_state *, int8_t *);
+int cpack_uint16(netdissect_options *, struct cpack_state *, uint16_t *);
+int cpack_int16(netdissect_options *, struct cpack_state *, int16_t *);
+int cpack_uint32(netdissect_options *, struct cpack_state *, uint32_t *);
+int cpack_int32(netdissect_options *, struct cpack_state *, int32_t *);
+int cpack_uint64(netdissect_options *, struct cpack_state *, uint64_t *);
+int cpack_int64(netdissect_options *, struct cpack_state *, int64_t *);
 
 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))
-#define cpack_int32(__s, __p)  cpack_uint32((__s), (uint32_t*)(__p))
-#define cpack_int64(__s, __p)  cpack_uint64((__s), (uint64_t*)(__p))
-
 extern int cpack_advance(struct cpack_state *, const size_t);
 
 #endif /* _CPACK_H */