tinycbor; make structure naming for writers/readers be consistent.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/15b7d4fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/15b7d4fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/15b7d4fe Branch: refs/heads/develop Commit: 15b7d4fe1d944922ea927a3779da46dc5662877b Parents: 0cd5c13 Author: Marko Kiiskila <[email protected]> Authored: Fri Jan 6 11:20:36 2017 -0800 Committer: Marko Kiiskila <[email protected]> Committed: Fri Jan 6 15:02:59 2017 -0800 ---------------------------------------------------------------------- .../tinycbor/include/tinycbor/cbor_buf_reader.h | 4 +- .../tinycbor/include/tinycbor/cbor_buf_writer.h | 12 ++--- .../include/tinycbor/cbor_mbuf_reader.h | 14 +++-- .../include/tinycbor/cbor_mbuf_writer.h | 7 ++- encoding/tinycbor/src/cbor_buf_reader.c | 25 ++++++--- encoding/tinycbor/src/cbor_buf_writer.c | 16 +++--- encoding/tinycbor/src/cbor_mbuf_reader.c | 55 ++++++++++++-------- encoding/tinycbor/src/cbor_mbuf_writer.c | 7 ++- 8 files changed, 82 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/include/tinycbor/cbor_buf_reader.h ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/include/tinycbor/cbor_buf_reader.h b/encoding/tinycbor/include/tinycbor/cbor_buf_reader.h index d966c56..8a56866 100644 --- a/encoding/tinycbor/include/tinycbor/cbor_buf_reader.h +++ b/encoding/tinycbor/include/tinycbor/cbor_buf_reader.h @@ -32,8 +32,8 @@ struct cbor_buf_reader { const uint8_t *buffer; }; -void -cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer, size_t data); +void cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer, + size_t data); #ifdef __cplusplus } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/include/tinycbor/cbor_buf_writer.h ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/include/tinycbor/cbor_buf_writer.h b/encoding/tinycbor/include/tinycbor/cbor_buf_writer.h index 0d440a8..dd86651 100644 --- a/encoding/tinycbor/include/tinycbor/cbor_buf_writer.h +++ b/encoding/tinycbor/include/tinycbor/cbor_buf_writer.h @@ -24,18 +24,16 @@ extern "C" { #endif -struct CborBufWriter { +struct cbor_buf_writer { struct cbor_encoder_writer enc; uint8_t *ptr; const uint8_t *end; }; -void -cbor_buf_writer_init(struct CborBufWriter *cb, uint8_t *buffer, size_t data); - -size_t -cbor_buf_writer_buffer_size(struct CborBufWriter *cb, const uint8_t *buffer); - +void cbor_buf_writer_init(struct cbor_buf_writer *cb, uint8_t *buffer, + size_t data); +size_t cbor_buf_writer_buffer_size(struct cbor_buf_writer *cb, + const uint8_t *buffer); #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h b/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h index cbe819a..03be2fc 100644 --- a/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h +++ b/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h @@ -20,23 +20,21 @@ #ifndef CBOR_MBUF_READER_H #define CBOR_MBUF_READER_H +#include <tinycbor/cbor.h> +#include <os/os_mbuf.h> + #ifdef __cplusplus extern "C" { #endif -#include <tinycbor/cbor.h> -#include <os/os_mbuf.h> - -struct CborMbufReader { +struct cbor_mbuf_reader { struct cbor_decoder_reader r; int init_off; /* initial offset into the data */ struct os_mbuf *m; }; -void -cbor_mbuf_reader_init(struct CborMbufReader *cb, - struct os_mbuf *m, - int intial_offset); +void cbor_mbuf_reader_init(struct cbor_mbuf_reader *cb, struct os_mbuf *m, + int intial_offset); #ifdef __cplusplus } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h b/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h index 2c904e5..8780cd0 100644 --- a/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h +++ b/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h @@ -20,16 +20,19 @@ #ifndef CBOR_MBUF_WRITER_H #define CBOR_MBUF_WRITER_H +#include <tinycbor/cbor.h> +#include <os/os_mbuf.h> + #ifdef __cplusplus extern "C" { #endif -struct CborMbufWriter { +struct cbor_mbuf_writer { struct cbor_encoder_writer enc; struct os_mbuf *m; }; -void cbor_mbuf_writer_init(struct CborMbufWriter *cb, struct os_mbuf *m); +void cbor_mbuf_writer_init(struct cbor_mbuf_writer *cb, struct os_mbuf *m); #ifdef __cplusplus } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/src/cbor_buf_reader.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cbor_buf_reader.c b/encoding/tinycbor/src/cbor_buf_reader.c index 4ec5ebf..0d8379c 100644 --- a/encoding/tinycbor/src/cbor_buf_reader.c +++ b/encoding/tinycbor/src/cbor_buf_reader.c @@ -21,19 +21,22 @@ #include <tinycbor/extract_number_p.h> static uint8_t -cbuf_buf_reader_get8(struct cbor_decoder_reader *d, int offset) { +cbuf_buf_reader_get8(struct cbor_decoder_reader *d, int offset) +{ struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d; return cb->buffer[offset]; } static uint16_t -cbuf_buf_reader_get16(struct cbor_decoder_reader *d, int offset) { +cbuf_buf_reader_get16(struct cbor_decoder_reader *d, int offset) +{ struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d; return get16(cb->buffer + offset); } static uint32_t -cbuf_buf_reader_get32(struct cbor_decoder_reader *d, int offset) { +cbuf_buf_reader_get32(struct cbor_decoder_reader *d, int offset) +{ uint32_t val; struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d; val = get32(cb->buffer + offset); @@ -41,25 +44,31 @@ cbuf_buf_reader_get32(struct cbor_decoder_reader *d, int offset) { } static uint64_t -cbuf_buf_reader_get64(struct cbor_decoder_reader *d, int offset) { +cbuf_buf_reader_get64(struct cbor_decoder_reader *d, int offset) +{ struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d; return get64(cb->buffer + offset); } static uintptr_t -cbor_buf_reader_cmp(struct cbor_decoder_reader *d, char *dst, int src_offset, size_t len) { +cbor_buf_reader_cmp(struct cbor_decoder_reader *d, char *dst, int src_offset, + size_t len) +{ struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d; return memcmp(dst, cb->buffer + src_offset, len); } static uintptr_t -cbor_buf_reader_cpy(struct cbor_decoder_reader *d, char *dst, int src_offset, size_t len) { +cbor_buf_reader_cpy(struct cbor_decoder_reader *d, char *dst, int src_offset, + size_t len) +{ struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d; return (uintptr_t) memcpy(dst, cb->buffer + src_offset, len); } void -cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer, size_t data) +cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer, + size_t data) { cb->buffer = buffer; cb->r.get8 = &cbuf_buf_reader_get8; @@ -69,4 +78,4 @@ cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer, size_t d cb->r.cmp = &cbor_buf_reader_cmp; cb->r.cpy = &cbor_buf_reader_cpy; cb->r.message_size = data; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/src/cbor_buf_writer.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cbor_buf_writer.c b/encoding/tinycbor/src/cbor_buf_writer.c index 5c68386..962fa3f 100644 --- a/encoding/tinycbor/src/cbor_buf_writer.c +++ b/encoding/tinycbor/src/cbor_buf_writer.c @@ -20,7 +20,8 @@ #include <tinycbor/cbor.h> #include <tinycbor/cbor_buf_writer.h> -static inline int would_overflow(struct CborBufWriter *cb, size_t len) +static inline int +would_overflow(struct cbor_buf_writer *cb, size_t len) { ptrdiff_t remaining = (ptrdiff_t)cb->end; remaining -= (ptrdiff_t)cb->ptr; @@ -28,8 +29,10 @@ static inline int would_overflow(struct CborBufWriter *cb, size_t len) return (remaining < 0); } -int cbor_buf_writer(struct cbor_encoder_writer *arg, const char *data, int len) { - struct CborBufWriter *cb = (struct CborBufWriter *) arg; +int +cbor_buf_writer(struct cbor_encoder_writer *arg, const char *data, int len) +{ + struct cbor_buf_writer *cb = (struct cbor_buf_writer *) arg; if (would_overflow(cb, len)) { return CborErrorOutOfMemory; @@ -41,7 +44,8 @@ int cbor_buf_writer(struct cbor_encoder_writer *arg, const char *data, int len) return CborNoError; } -void cbor_buf_writer_init(struct CborBufWriter *cb, uint8_t *buffer, size_t size) +void +cbor_buf_writer_init(struct cbor_buf_writer *cb, uint8_t *buffer, size_t size) { cb->ptr = buffer; cb->end = buffer + size; @@ -50,7 +54,7 @@ void cbor_buf_writer_init(struct CborBufWriter *cb, uint8_t *buffer, size_t size } size_t -cbor_buf_writer_buffer_size(struct CborBufWriter *cb, const uint8_t *buffer) +cbor_buf_writer_buffer_size(struct cbor_buf_writer *cb, const uint8_t *buffer) { return (size_t)(cb->ptr - buffer); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/src/cbor_mbuf_reader.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cbor_mbuf_reader.c b/encoding/tinycbor/src/cbor_mbuf_reader.c index 4c72a25..03f9a66 100644 --- a/encoding/tinycbor/src/cbor_mbuf_reader.c +++ b/encoding/tinycbor/src/cbor_mbuf_reader.c @@ -22,68 +22,81 @@ #include <os/os_mbuf.h> static uint8_t -cbuf_mbuf_reader_get8(struct cbor_decoder_reader *d, int offset) { +cbor_mbuf_reader_get8(struct cbor_decoder_reader *d, int offset) +{ uint8_t val; - struct CborMbufReader *cb = (struct CborMbufReader *) d; + struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d; + os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val); return val; } static uint16_t -cbuf_mbuf_reader_get16(struct cbor_decoder_reader *d, int offset) { +cbor_mbuf_reader_get16(struct cbor_decoder_reader *d, int offset) +{ uint16_t val; - struct CborMbufReader *cb = (struct CborMbufReader *) d; + struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d; + os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val); return cbor_ntohs(val); } static uint32_t -cbuf_mbuf_reader_get32(struct cbor_decoder_reader *d, int offset) { +cbor_mbuf_reader_get32(struct cbor_decoder_reader *d, int offset) +{ uint32_t val; - struct CborMbufReader *cb = (struct CborMbufReader *) d; + struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d; + os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val); return cbor_ntohl(val); } static uint64_t -cbuf_mbuf_reader_get64(struct cbor_decoder_reader *d, int offset) { +cbor_mbuf_reader_get64(struct cbor_decoder_reader *d, int offset) +{ uint64_t val; - struct CborMbufReader *cb = (struct CborMbufReader *) d; + struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d; + os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val); return cbor_ntohll(val); } static uintptr_t -cbor_mbuf_reader_cmp(struct cbor_decoder_reader *d, char *buf, int offset, size_t len) { - struct CborMbufReader *cb = (struct CborMbufReader *) d; +cbor_mbuf_reader_cmp(struct cbor_decoder_reader *d, char *buf, int offset, + size_t len) +{ + struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d; return os_mbuf_cmpf(cb->m, offset + cb->init_off, buf, len); } static uintptr_t -cbor_mbuf_reader_cpy(struct cbor_decoder_reader *d, char *dst, int offset, size_t len) { +cbor_mbuf_reader_cpy(struct cbor_decoder_reader *d, char *dst, int offset, + size_t len) +{ int rc; - struct CborMbufReader *cb = (struct CborMbufReader *) d; - rc = os_mbuf_copydata(cb->m, offset + cb->init_off, len, dst); + struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d; - if(rc == 0) { + rc = os_mbuf_copydata(cb->m, offset + cb->init_off, len, dst); + if (rc == 0) { return true; } return false; } void -cbor_mbuf_reader_init(struct CborMbufReader *cb, struct os_mbuf *m, - int initial_offset) +cbor_mbuf_reader_init(struct cbor_mbuf_reader *cb, struct os_mbuf *m, + int initial_offset) { struct os_mbuf_pkthdr *hdr; - cb->r.get8 = &cbuf_mbuf_reader_get8; - cb->r.get16 = &cbuf_mbuf_reader_get16; - cb->r.get32 = &cbuf_mbuf_reader_get32; - cb->r.get64 = &cbuf_mbuf_reader_get64; + + cb->r.get8 = &cbor_mbuf_reader_get8; + cb->r.get16 = &cbor_mbuf_reader_get16; + cb->r.get32 = &cbor_mbuf_reader_get32; + cb->r.get64 = &cbor_mbuf_reader_get64; cb->r.cmp = &cbor_mbuf_reader_cmp; cb->r.cpy = &cbor_mbuf_reader_cpy; - assert (OS_MBUF_IS_PKTHDR(m)); + assert(OS_MBUF_IS_PKTHDR(m)); hdr = OS_MBUF_PKTHDR(m); cb->m = m; cb->init_off = initial_offset; http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/15b7d4fe/encoding/tinycbor/src/cbor_mbuf_writer.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cbor_mbuf_writer.c b/encoding/tinycbor/src/cbor_mbuf_writer.c index 119193c..862565b 100644 --- a/encoding/tinycbor/src/cbor_mbuf_writer.c +++ b/encoding/tinycbor/src/cbor_mbuf_writer.c @@ -26,20 +26,19 @@ int cbor_mbuf_writer(struct cbor_encoder_writer *arg, const char *data, int len) { int rc; - struct CborMbufWriter *cb = (struct CborMbufWriter *) arg; - rc = os_mbuf_append(cb->m, data, len); + struct cbor_mbuf_writer *cb = (struct cbor_mbuf_writer *) arg; + rc = os_mbuf_append(cb->m, data, len); if (rc) { return CborErrorOutOfMemory; } - cb->enc.bytes_written += len; return CborNoError; } void -cbor_mbuf_writer_init(struct CborMbufWriter *cb, struct os_mbuf *m) +cbor_mbuf_writer_init(struct cbor_mbuf_writer *cb, struct os_mbuf *m) { cb->m = m; cb->enc.bytes_written = 0;
