diff options
| author |   Petteri Aimonen <jpa@npb.mail.kapsi.fi> | 2011-07-27 19:22:11 +0000 |
|---|---|---|
| committer | Petteri Aimonen <jpa@npb.mail.kapsi.fi> | 2011-07-27 19:22:11 +0000 |
| commit | 84304b343a4b06a7918bc80ab45f08d1cae0b9cb (patch) | |
| tree | 33ab5cb7d1282d60cc64ffd97cb607508c0c16a0 /pb_decode.h | |
| parent | 14bbe229974b516a82594ec6476488154e8957fa (diff) | |
Improvements, array support
git-svn-id: https://svn.kapsi.fi/jpa/nanopb@943 e3a754e5-d11d-0410-8d38-ebb782a927b9
Diffstat (limited to 'pb_decode.h')
| -rw-r--r-- | pb_decode.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pb_decode.h b/pb_decode.h index b71e20b1..2f689394 100644 --- a/pb_decode.h +++ b/pb_decode.h @@ -6,12 +6,14 @@ // Decode from stream to destination struct. // The actual struct pointed to by dest must match the description in fields. -bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest); +bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct); /* --- Helper functions --- - * You may want to use these from your callbacks. + * You may want to use these from your caller or callbacks. */ +pb_istream_t pb_istream_from_buffer(uint8_t *buf, size_t bufsize); + bool pb_decode_varint32(pb_istream_t *stream, uint32_t *dest); bool pb_decode_varint64(pb_istream_t *stream, uint64_t *dest); @@ -20,10 +22,10 @@ bool pb_skip_string(pb_istream_t *stream); /* --- Field decoders --- * Each decoder takes stream and field description, and a pointer to the field - * in the destination struct (dest = struct_addr + field->offset). + * in the destination struct (dest = struct_addr + field->data_offset). + * For arrays, these functions are called repeatedly. */ -// Integer types. bool pb_dec_uint32(pb_istream_t *stream, const pb_field_t *field, void *dest); bool pb_dec_sint32(pb_istream_t *stream, const pb_field_t *field, void *dest); bool pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, void *dest); @@ -31,25 +33,20 @@ bool pb_dec_uint64(pb_istream_t *stream, const pb_field_t *field, void *dest); bool pb_dec_sint64(pb_istream_t *stream, const pb_field_t *field, void *dest); bool pb_dec_fixed64(pb_istream_t *stream, const pb_field_t *field, void *dest); bool pb_dec_bool(pb_istream_t *stream, const pb_field_t *field, void *dest); +bool pb_dec_enum(pb_istream_t *stream, const pb_field_t *field, void *dest); -// Floating point types. Info is ignored. bool pb_dec_float(pb_istream_t *stream, const pb_field_t *field, void *dest); bool pb_dec_double(pb_istream_t *stream, const pb_field_t *field, void *dest); -// Byte array. Dest is pointer to bool pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, void *dest); - -// Null-terminated string. bool pb_dec_string(pb_istream_t *stream, const pb_field_t *field, void *dest); - -// Use callback. Dest is pointer to pb_callback_t struct. bool pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field, void *dest); typedef bool (*pb_decoder_t)(pb_istream_t *stream, const pb_field_t *field, void *dest); /* --- Function pointers to field decoders --- - * Order in the array must match pb_action_t numbering. + * Order in the array must match pb_action_t LTYPE numbering. */ -const pb_decoder_t PB_DECODERS[PB_LAST_ACT]; +const pb_decoder_t PB_DECODERS[16]; #endif |