From ec02e05cf4d1bbb66ee31223f9e96c28bf3ae6f1 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sat, 16 May 2015 13:31:38 +0200 Subject: src: Use stdint types everywhere Signed-off-by: Felix Janda Signed-off-by: Pablo Neira Ayuso --- src/expect/api.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/expect/api.c') diff --git a/src/expect/api.c b/src/expect/api.c index a1dbbff..8ff20e2 100644 --- a/src/expect/api.c +++ b/src/expect/api.c @@ -329,7 +329,7 @@ void nfexp_set_attr(struct nf_expect *exp, */ void nfexp_set_attr_u8(struct nf_expect *exp, const enum nf_expect_attr type, - u_int8_t value) + uint8_t value) { nfexp_set_attr(exp, type, &value); } @@ -342,7 +342,7 @@ void nfexp_set_attr_u8(struct nf_expect *exp, */ void nfexp_set_attr_u16(struct nf_expect *exp, const enum nf_expect_attr type, - u_int16_t value) + uint16_t value) { nfexp_set_attr(exp, type, &value); } @@ -355,7 +355,7 @@ void nfexp_set_attr_u16(struct nf_expect *exp, */ void nfexp_set_attr_u32(struct nf_expect *exp, const enum nf_expect_attr type, - u_int32_t value) + uint32_t value) { nfexp_set_attr(exp, type, &value); } @@ -395,10 +395,10 @@ const void *nfexp_get_attr(const struct nf_expect *exp, * set, 0 is returned. In order to check if the attribute is set or not, * use nfexp_attr_is_set. */ -u_int8_t nfexp_get_attr_u8(const struct nf_expect *exp, +uint8_t nfexp_get_attr_u8(const struct nf_expect *exp, const enum nf_expect_attr type) { - const u_int8_t *ret = nfexp_get_attr(exp, type); + const uint8_t *ret = nfexp_get_attr(exp, type); return ret == NULL ? 0 : *ret; } @@ -411,10 +411,10 @@ u_int8_t nfexp_get_attr_u8(const struct nf_expect *exp, * set, 0 is returned. In order to check if the attribute is set or not, * use nfexp_attr_is_set. */ -u_int16_t nfexp_get_attr_u16(const struct nf_expect *exp, +uint16_t nfexp_get_attr_u16(const struct nf_expect *exp, const enum nf_expect_attr type) { - const u_int16_t *ret = nfexp_get_attr(exp, type); + const uint16_t *ret = nfexp_get_attr(exp, type); return ret == NULL ? 0 : *ret; } @@ -427,10 +427,10 @@ u_int16_t nfexp_get_attr_u16(const struct nf_expect *exp, * set, 0 is returned. In order to check if the attribute is set or not, * use nfexp_attr_is_set. */ -u_int32_t nfexp_get_attr_u32(const struct nf_expect *exp, +uint32_t nfexp_get_attr_u32(const struct nf_expect *exp, const enum nf_expect_attr type) { - const u_int32_t *ret = nfexp_get_attr(exp, type); + const uint32_t *ret = nfexp_get_attr(exp, type); return ret == NULL ? 0 : *ret; } @@ -504,8 +504,8 @@ int nfexp_attr_unset(struct nf_expect *exp, int nfexp_build_expect(struct nfnl_subsys_handle *ssh, void *req, size_t size, - u_int16_t type, - u_int16_t flags, + uint16_t type, + uint16_t flags, const struct nf_expect *exp) { assert(ssh != NULL); @@ -521,7 +521,7 @@ __build_query_exp(struct nfnl_subsys_handle *ssh, const void *data, void *buffer, unsigned int size) { struct nfnlhdr *req = buffer; - const u_int8_t *family = data; + const uint8_t *family = data; assert(ssh != NULL); assert(data != NULL); @@ -580,7 +580,7 @@ __build_query_exp(struct nfnl_subsys_handle *ssh, * NFEXP_Q_FLUSH * NFEXP_Q_DUMP * - * Pass a valid pointer to the protocol family (u_int8_t) + * Pass a valid pointer to the protocol family (uint8_t) * * On success, 0 is returned. On error, -1 is returned and errno is set * appropiately. -- cgit v1.2.3