You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
2.8 KiB
Diff
51 lines
2.8 KiB
Diff
From 228ac53093365c7c02feeb420fa6189e932e5a9f Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Valentin <benpicco@zedat.fu-berlin.de>
|
|
Date: Sun, 18 May 2014 22:48:40 +0200
|
|
Subject: [PATCH 04/10] fix conflicting types
|
|
|
|
---
|
|
src-api/rfc5444/rfc5444_reader.c | 10 +++++-----
|
|
src-api/rfc5444/rfc5444_reader.h | 2 +-
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src-api/rfc5444/rfc5444_reader.c b/src-api/rfc5444/rfc5444_reader.c
|
|
index 290f558..1ad344a 100644
|
|
--- a/src-api/rfc5444/rfc5444_reader.c
|
|
+++ b/src-api/rfc5444/rfc5444_reader.c
|
|
@@ -62,15 +62,15 @@ static int _compare_tlvtypes(struct rfc5444_reader_tlvblock_entry *tlv,
|
|
static uint8_t _rfc5444_get_u8(uint8_t **ptr, uint8_t *end, enum rfc5444_result *result);
|
|
static uint16_t _rfc5444_get_u16(uint8_t **ptr, uint8_t *end, enum rfc5444_result *result);
|
|
static void _free_tlvblock(struct rfc5444_reader *parser, struct avl_tree *entries);
|
|
-static int _parse_tlv(struct rfc5444_reader_tlvblock_entry *entry, uint8_t **ptr,
|
|
+static enum rfc5444_result _parse_tlv(struct rfc5444_reader_tlvblock_entry *entry, uint8_t **ptr,
|
|
uint8_t *eob, uint8_t addr_count);
|
|
-static int _parse_tlvblock(struct rfc5444_reader *parser,
|
|
+static enum rfc5444_result _parse_tlvblock(struct rfc5444_reader *parser,
|
|
struct avl_tree *tlvblock, uint8_t **ptr, uint8_t *eob, uint8_t addr_count);
|
|
-static int _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer,
|
|
+static enum rfc5444_result _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer,
|
|
struct rfc5444_reader_tlvblock_context *context, struct avl_tree *entries, uint8_t idx);
|
|
-static int _parse_addrblock(struct rfc5444_reader_addrblock_entry *addr_entry,
|
|
+static enum rfc5444_result _parse_addrblock(struct rfc5444_reader_addrblock_entry *addr_entry,
|
|
struct rfc5444_reader_tlvblock_context *tlv_context, uint8_t **ptr, uint8_t *eob);
|
|
-static int _handle_message(struct rfc5444_reader *parser,
|
|
+static enum rfc5444_result _handle_message(struct rfc5444_reader *parser,
|
|
struct rfc5444_reader_tlvblock_context *tlv_context, uint8_t **ptr, uint8_t *eob);
|
|
static struct rfc5444_reader_tlvblock_consumer *_add_consumer(
|
|
struct rfc5444_reader_tlvblock_consumer *, struct avl_tree *consumer_tree,
|
|
diff --git a/src-api/rfc5444/rfc5444_reader.h b/src-api/rfc5444/rfc5444_reader.h
|
|
index 6962741..c1ca7f6 100644
|
|
--- a/src-api/rfc5444/rfc5444_reader.h
|
|
+++ b/src-api/rfc5444/rfc5444_reader.h
|
|
@@ -309,7 +309,7 @@ EXPORT void rfc5444_reader_remove_packet_consumer(
|
|
EXPORT void rfc5444_reader_remove_message_consumer(
|
|
struct rfc5444_reader *, struct rfc5444_reader_tlvblock_consumer *);
|
|
|
|
-EXPORT int rfc5444_reader_handle_packet(
|
|
+EXPORT enum rfc5444_result rfc5444_reader_handle_packet(
|
|
struct rfc5444_reader *parser, uint8_t *buffer, size_t length);
|
|
|
|
EXPORT uint8_t *rfc5444_reader_get_tlv_value(
|
|
--
|
|
1.9.1
|