From 753ffa563b67feee30069d8637c920da809107da Mon Sep 17 00:00:00 2001 From: Niels Provos Date: Sat, 30 Jun 2007 19:08:46 +0000 Subject: [PATCH] convert u_int8_t types to uint8_t types svn:r368 --- configure.in | 8 +++---- event.h | 32 ++++++++++++------------- event_tagging.c | 64 ++++++++++++++++++++++++------------------------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/configure.in b/configure.in index 4a3626b8..507090b3 100644 --- a/configure.in +++ b/configure.in @@ -337,10 +337,10 @@ fi AC_TYPE_PID_T AC_TYPE_SIZE_T -AC_CHECK_TYPE(u_int64_t, unsigned long long) -AC_CHECK_TYPE(u_int32_t, unsigned int) -AC_CHECK_TYPE(u_int16_t, unsigned short) -AC_CHECK_TYPE(u_int8_t, unsigned char) +AC_CHECK_TYPE(uint64_t, unsigned long long) +AC_CHECK_TYPE(uint32_t, unsigned int) +AC_CHECK_TYPE(uint16_t, unsigned short) +AC_CHECK_TYPE(uint8_t, unsigned char) AC_CHECK_TYPES([struct in6_addr], , , [#ifdef WIN32 #include diff --git a/event.h b/event.h index 753008a7..ab2eae4e 100644 --- a/event.h +++ b/event.h @@ -301,39 +301,37 @@ void evbuffer_setcb(struct evbuffer *, void (*)(struct evbuffer *, size_t, size_ void evtag_init(void); -void evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, const void *data, - u_int32_t len); +void evtag_marshal(struct evbuffer *evbuf, uint8_t tag, const void *data, + uint32_t len); -void encode_int(struct evbuffer *evbuf, u_int32_t number); +void encode_int(struct evbuffer *evbuf, uint32_t number); -void evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag, - u_int32_t integer); +void evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer); -void evtag_marshal_string(struct evbuffer *buf, u_int8_t tag, +void evtag_marshal_string(struct evbuffer *buf, uint8_t tag, const char *string); -void evtag_marshal_timeval(struct evbuffer *evbuf, u_int8_t tag, +void evtag_marshal_timeval(struct evbuffer *evbuf, uint8_t tag, struct timeval *tv); void evtag_test(void); -int evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, - struct evbuffer *dst); -int evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag); -int evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength); -int evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength); +int evtag_unmarshal(struct evbuffer *src, uint8_t *ptag, struct evbuffer *dst); +int evtag_peek(struct evbuffer *evbuf, uint8_t *ptag); +int evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength); +int evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength); int evtag_consume(struct evbuffer *evbuf); -int evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag, - u_int32_t *pinteger); +int evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag, + uint32_t *pinteger); -int evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data, +int evtag_unmarshal_fixed(struct evbuffer *src, uint8_t need_tag, void *data, size_t len); -int evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag, +int evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag, char **pstring); -int evtag_unmarshal_timeval(struct evbuffer *evbuf, u_int8_t need_tag, +int evtag_unmarshal_timeval(struct evbuffer *evbuf, uint8_t need_tag, struct timeval *ptv); #ifdef __cplusplus diff --git a/event_tagging.c b/event_tagging.c index 6bb44e23..3266d543 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -58,7 +58,7 @@ #include "event.h" #include "log.h" -int decode_int(u_int32_t *pnumber, struct evbuffer *evbuf); +int decode_int(uint32_t *pnumber, struct evbuffer *evbuf); static struct evbuffer *_buf; /* not thread safe */ @@ -79,10 +79,10 @@ evtag_init() */ void -encode_int(struct evbuffer *evbuf, u_int32_t number) +encode_int(struct evbuffer *evbuf, uint32_t number) { int off = 1, nibbles = 0; - u_int8_t data[5]; + uint8_t data[5]; memset(data, 0, sizeof(data)); while (number) { @@ -111,8 +111,8 @@ encode_int(struct evbuffer *evbuf, u_int32_t number) */ void -evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, - const void *data, u_int32_t len) +evtag_marshal(struct evbuffer *evbuf, uint8_t tag, + const void *data, uint32_t len) { evbuffer_add(evbuf, &tag, sizeof(tag)); encode_int(evbuf, len); @@ -121,7 +121,7 @@ evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, /* Marshaling for integers */ void -evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag, u_int32_t integer) +evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer) { evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); encode_int(_buf, integer); @@ -132,13 +132,13 @@ evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag, u_int32_t integer) } void -evtag_marshal_string(struct evbuffer *buf, u_int8_t tag, const char *string) +evtag_marshal_string(struct evbuffer *buf, uint8_t tag, const char *string) { evtag_marshal(buf, tag, string, strlen(string)); } void -evtag_marshal_timeval(struct evbuffer *evbuf, u_int8_t tag, struct timeval *tv) +evtag_marshal_timeval(struct evbuffer *evbuf, uint8_t tag, struct timeval *tv) { evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); @@ -150,10 +150,10 @@ evtag_marshal_timeval(struct evbuffer *evbuf, u_int8_t tag, struct timeval *tv) } static int -decode_int_internal(u_int32_t *pnumber, struct evbuffer *evbuf, int dodrain) +decode_int_internal(uint32_t *pnumber, struct evbuffer *evbuf, int dodrain) { - u_int32_t number = 0; - u_int8_t *data = EVBUFFER_DATA(evbuf); + uint32_t number = 0; + uint8_t *data = EVBUFFER_DATA(evbuf); int len = EVBUFFER_LENGTH(evbuf); int nibbles = 0, off; @@ -184,13 +184,13 @@ decode_int_internal(u_int32_t *pnumber, struct evbuffer *evbuf, int dodrain) } int -decode_int(u_int32_t *pnumber, struct evbuffer *evbuf) +decode_int(uint32_t *pnumber, struct evbuffer *evbuf) { return (decode_int_internal(pnumber, evbuf, 1) == -1 ? -1 : 0); } int -evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag) +evtag_peek(struct evbuffer *evbuf, uint8_t *ptag) { if (EVBUFFER_LENGTH(evbuf) < 2) return (-1); @@ -200,7 +200,7 @@ evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag) } int -evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength) +evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength) { struct evbuffer tmp; int res; @@ -222,7 +222,7 @@ evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength) } int -evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength) +evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength) { struct evbuffer tmp; int res; @@ -244,7 +244,7 @@ evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength) int evtag_consume(struct evbuffer *evbuf) { - u_int32_t len; + uint32_t len; evbuffer_drain(evbuf, 1); if (decode_int(&len, evbuf) == -1) return (-1); @@ -256,11 +256,11 @@ evtag_consume(struct evbuffer *evbuf) /* Reads the data type from an event buffer */ int -evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, struct evbuffer *dst) +evtag_unmarshal(struct evbuffer *src, uint8_t *ptag, struct evbuffer *dst) { - u_int8_t tag; - u_int32_t len; - u_int32_t integer; + uint8_t tag; + uint32_t len; + uint32_t integer; if (evbuffer_remove(src, &tag, sizeof(tag)) != sizeof(tag)) return (-1); @@ -283,12 +283,12 @@ evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, struct evbuffer *dst) /* Marshaling for integers */ int -evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag, - u_int32_t *pinteger) +evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag, + uint32_t *pinteger) { - u_int8_t tag; - u_int32_t len; - u_int32_t integer; + uint8_t tag; + uint32_t len; + uint32_t integer; if (evbuffer_remove(evbuf, &tag, sizeof(tag)) != sizeof(tag) || tag != need_tag) @@ -312,10 +312,10 @@ evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag, /* Unmarshal a fixed length tag */ int -evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data, +evtag_unmarshal_fixed(struct evbuffer *src, uint8_t need_tag, void *data, size_t len) { - u_int8_t tag; + uint8_t tag; /* Initialize this event buffer so that we can read into it */ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); @@ -332,10 +332,10 @@ evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data, } int -evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag, +evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag, char **pstring) { - u_int8_t tag; + uint8_t tag; evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); @@ -351,11 +351,11 @@ evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag, } int -evtag_unmarshal_timeval(struct evbuffer *evbuf, u_int8_t need_tag, +evtag_unmarshal_timeval(struct evbuffer *evbuf, uint8_t need_tag, struct timeval *ptv) { - u_int8_t tag; - u_int32_t integer; + uint8_t tag; + uint32_t integer; evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag)