remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / cpack.c

diff --git a/cpack.c b/cpack.c
index 7628a5c3e3dee8b093bc823c07e239a61146edda..db3b6dc227b406cb4a6b7d3d38d54aa56dc57fd3 100644 (file)
--- a/cpack.c
+++ b/cpack.c
@@ -28,16 +28,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdlib.h>
 #include <string.h>
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include "cpack.h"
+#include "netdissect.h"
 #include "extract.h"
 
+#include "cpack.h"
+
 const uint8_t *
 cpack_next_boundary(const uint8_t *buf, const uint8_t *p, size_t alignment)
 {
@@ -93,14 +95,14 @@ cpack_init(struct cpack_state *cs, const uint8_t *buf, size_t buflen)
 
 /* Unpack a 64-bit unsigned integer. */
 int
-cpack_uint64(struct cpack_state *cs, uint64_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_LE_U_8(next);
+       *u = GET_LE_U_8(next);
 
        /* Move pointer past the uint64_t. */
        cs->c_next = next + sizeof(*u);
@@ -109,14 +111,14 @@ cpack_uint64(struct cpack_state *cs, uint64_t *u)
 
 /* Unpack a 64-bit signed integer. */
 int
-cpack_int64(struct cpack_state *cs, int64_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_LE_S_8(next);
+       *u = GET_LE_S_8(next);
 
        /* Move pointer past the int64_t. */
        cs->c_next = next + sizeof(*u);
@@ -125,14 +127,14 @@ cpack_int64(struct cpack_state *cs, int64_t *u)
 
 /* Unpack a 32-bit unsigned integer. */
 int
-cpack_uint32(struct cpack_state *cs, uint32_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_LE_U_4(next);
+       *u = GET_LE_U_4(next);
 
        /* Move pointer past the uint32_t. */
        cs->c_next = next + sizeof(*u);
@@ -141,14 +143,14 @@ cpack_uint32(struct cpack_state *cs, uint32_t *u)
 
 /* Unpack a 32-bit signed integer. */
 int
-cpack_int32(struct cpack_state *cs, int32_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_LE_S_4(next);
+       *u = GET_LE_S_4(next);
 
        /* Move pointer past the int32_t. */
        cs->c_next = next + sizeof(*u);
@@ -157,14 +159,14 @@ cpack_int32(struct cpack_state *cs, int32_t *u)
 
 /* Unpack a 16-bit unsigned integer. */
 int
-cpack_uint16(struct cpack_state *cs, uint16_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_LE_U_2(next);
+       *u = GET_LE_U_2(next);
 
        /* Move pointer past the uint16_t. */
        cs->c_next = next + sizeof(*u);
@@ -173,14 +175,14 @@ cpack_uint16(struct cpack_state *cs, uint16_t *u)
 
 /* Unpack a 16-bit signed integer. */
 int
-cpack_int16(struct cpack_state *cs, int16_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_LE_S_2(next);
+       *u = GET_LE_S_2(next);
 
        /* Move pointer past the int16_t. */
        cs->c_next = next + sizeof(*u);
@@ -189,13 +191,13 @@ cpack_int16(struct cpack_state *cs, int16_t *u)
 
 /* Unpack an 8-bit unsigned integer. */
 int
-cpack_uint8(struct cpack_state *cs, uint8_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_U_1(cs->c_next);
+       *u = GET_U_1(cs->c_next);
 
        /* Move pointer past the uint8_t. */
        cs->c_next++;
@@ -204,13 +206,13 @@ cpack_uint8(struct cpack_state *cs, uint8_t *u)
 
 /* Unpack an 8-bit signed integer. */
 int
-cpack_int8(struct cpack_state *cs, int8_t *u)
+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)
                return -1;
 
-       *u = EXTRACT_S_1(cs->c_next);
+       *u = GET_S_1(cs->c_next);
 
        /* Move pointer past the int8_t. */
        cs->c_next++;