cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 20:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

convert u_int8_t types to uint8_t types

Browse Source 
svn:r368
This commit is contained in:
Niels Provos 2007-06-30 19:08:46 +00:00
parent f0ff792afa
commit 753ffa563b
3 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -337,10 +337,10 @@ fi
AC_TYPE_PID_T AC_TYPE_PID_T
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_CHECK_TYPE(u_int64_t, unsigned long long) AC_CHECK_TYPE(uint64_t, unsigned long long)
AC_CHECK_TYPE(u_int32_t, unsigned int) AC_CHECK_TYPE(uint32_t, unsigned int)
AC_CHECK_TYPE(u_int16_t, unsigned short) AC_CHECK_TYPE(uint16_t, unsigned short)
AC_CHECK_TYPE(u_int8_t, unsigned char) AC_CHECK_TYPE(uint8_t, unsigned char)
AC_CHECK_TYPES([struct in6_addr], , , AC_CHECK_TYPES([struct in6_addr], , ,
[#ifdef WIN32 [#ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

32
event.h
View File

@ -301,39 +301,37 @@ void evbuffer_setcb(struct evbuffer *, void (*)(struct evbuffer *, size_t, size_
void evtag_init(void); void evtag_init(void);
void evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, const void *data, void evtag_marshal(struct evbuffer *evbuf, uint8_t tag, const void *data,
u_int32_t len); 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, void evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer);
u_int32_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); 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); struct timeval *tv);
void evtag_test(void); void evtag_test(void);
int evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, int evtag_unmarshal(struct evbuffer *src, uint8_t *ptag, struct evbuffer *dst);
struct evbuffer *dst); int evtag_peek(struct evbuffer *evbuf, uint8_t *ptag);
int evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag); int evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength);
int evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength); int evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength);
int evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength);
int evtag_consume(struct evbuffer *evbuf); int evtag_consume(struct evbuffer *evbuf);
int evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag, int evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag,
u_int32_t *pinteger); 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); 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); 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); struct timeval *ptv);
#ifdef __cplusplus #ifdef __cplusplus

64
event_tagging.c
View File

@ -58,7 +58,7 @@
#include "event.h" #include "event.h"
#include "log.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 */ static struct evbuffer *_buf; /* not thread safe */
@ -79,10 +79,10 @@ evtag_init()
*/ */
void void
encode_int(struct evbuffer *evbuf, u_int32_t number) encode_int(struct evbuffer *evbuf, uint32_t number)
{ {
int off = 1, nibbles = 0; int off = 1, nibbles = 0;
u_int8_t data[5]; uint8_t data[5];
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
while (number) { while (number) {
@ -111,8 +111,8 @@ encode_int(struct evbuffer *evbuf, u_int32_t number)
*/ */
void void
evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, evtag_marshal(struct evbuffer *evbuf, uint8_t tag,
const void *data, u_int32_t len) const void *data, uint32_t len)
{ {
evbuffer_add(evbuf, &tag, sizeof(tag)); evbuffer_add(evbuf, &tag, sizeof(tag));
encode_int(evbuf, len); encode_int(evbuf, len);
@ -121,7 +121,7 @@ evtag_marshal(struct evbuffer *evbuf, u_int8_t tag,
/* Marshaling for integers */ /* Marshaling for integers */
void 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)); evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
encode_int(_buf, integer); encode_int(_buf, integer);
@ -132,13 +132,13 @@ evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag, u_int32_t integer)
} }
void 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)); evtag_marshal(buf, tag, string, strlen(string));
} }
void 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)); 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 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; uint32_t number = 0;
u_int8_t *data = EVBUFFER_DATA(evbuf); uint8_t *data = EVBUFFER_DATA(evbuf);
int len = EVBUFFER_LENGTH(evbuf); int len = EVBUFFER_LENGTH(evbuf);
int nibbles = 0, off; int nibbles = 0, off;
@ -184,13 +184,13 @@ decode_int_internal(u_int32_t *pnumber, struct evbuffer *evbuf, int dodrain)
} }
int 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); return (decode_int_internal(pnumber, evbuf, 1) == -1 ? -1 : 0);
} }
int int
evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag) evtag_peek(struct evbuffer *evbuf, uint8_t *ptag)
{ {
if (EVBUFFER_LENGTH(evbuf) < 2) if (EVBUFFER_LENGTH(evbuf) < 2)
return (-1); return (-1);
@ -200,7 +200,7 @@ evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag)
} }
int int
evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength) evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength)
{ {
struct evbuffer tmp; struct evbuffer tmp;
int res; int res;
@ -222,7 +222,7 @@ evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength)
} }
int int
evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength) evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength)
{ {
struct evbuffer tmp; struct evbuffer tmp;
int res; int res;
@ -244,7 +244,7 @@ evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength)
int int
evtag_consume(struct evbuffer *evbuf) evtag_consume(struct evbuffer *evbuf)
{ {
u_int32_t len; uint32_t len;
evbuffer_drain(evbuf, 1); evbuffer_drain(evbuf, 1);
if (decode_int(&len, evbuf) == -1) if (decode_int(&len, evbuf) == -1)
return (-1); return (-1);
@ -256,11 +256,11 @@ evtag_consume(struct evbuffer *evbuf)
/* Reads the data type from an event buffer */ /* Reads the data type from an event buffer */
int 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; uint8_t tag;
u_int32_t len; uint32_t len;
u_int32_t integer; uint32_t integer;
if (evbuffer_remove(src, &tag, sizeof(tag)) != sizeof(tag)) if (evbuffer_remove(src, &tag, sizeof(tag)) != sizeof(tag))
return (-1); return (-1);
@ -283,12 +283,12 @@ evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, struct evbuffer *dst)
/* Marshaling for integers */ /* Marshaling for integers */
int int
evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag, evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag,
u_int32_t *pinteger) uint32_t *pinteger)
{ {
u_int8_t tag; uint8_t tag;
u_int32_t len; uint32_t len;
u_int32_t integer; uint32_t integer;
if (evbuffer_remove(evbuf, &tag, sizeof(tag)) != sizeof(tag) || if (evbuffer_remove(evbuf, &tag, sizeof(tag)) != sizeof(tag) ||
tag != need_tag) tag != need_tag)
@ -312,10 +312,10 @@ evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag,
/* Unmarshal a fixed length tag */ /* Unmarshal a fixed length tag */
int 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) size_t len)
{ {
u_int8_t tag; uint8_t tag;
/* Initialize this event buffer so that we can read into it */ /* Initialize this event buffer so that we can read into it */
evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
@ -332,10 +332,10 @@ evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data,
} }
int int
evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag, evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag,
char **pstring) char **pstring)
{ {
u_int8_t tag; uint8_t tag;
evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
@ -351,11 +351,11 @@ evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag,
} }
int 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) struct timeval *ptv)
{ {
u_int8_t tag; uint8_t tag;
u_int32_t integer; uint32_t integer;
evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf)); evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag) if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag)