summaryrefslogtreecommitdiffstats
path: root/pb_decode.h
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@npb.mail.kapsi.fi>2011-07-28 14:54:03 +0000
committerPetteri Aimonen <jpa@npb.mail.kapsi.fi>2011-07-28 14:54:03 +0000
commitb9ca72e6af6a3a74a5a1f581540e5004ab72ea2c (patch)
tree21cc5c662c52fc11c6c01bdc5253fbf95ccb7a06 /pb_decode.h
parentd9238da690d5eda9cb5139aa26734dff5ded2285 (diff)
git-svn-id: https://svn.kapsi.fi/jpa/nanopb@947 e3a754e5-d11d-0410-8d38-ebb782a927b9
Diffstat (limited to 'pb_decode.h')
-rw-r--r--pb_decode.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/pb_decode.h b/pb_decode.h
index ac4d1f70..448b55db 100644
--- a/pb_decode.h
+++ b/pb_decode.h
@@ -45,17 +45,9 @@ bool pb_skip_string(pb_istream_t *stream);
* For arrays, these functions are called repeatedly.
*/
-bool pb_dec_uint32(pb_istream_t *stream, const pb_field_t *field, uint32_t *dest);
-bool pb_dec_sint32(pb_istream_t *stream, const pb_field_t *field, int32_t *dest);
-bool pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, uint32_t *dest);
-bool pb_dec_uint64(pb_istream_t *stream, const pb_field_t *field, uint64_t *dest);
-bool pb_dec_sint64(pb_istream_t *stream, const pb_field_t *field, int64_t *dest);
-bool pb_dec_fixed64(pb_istream_t *stream, const pb_field_t *field, uint64_t *dest);
-bool pb_dec_bool(pb_istream_t *stream, const pb_field_t *field, bool *dest);
-bool pb_dec_enum(pb_istream_t *stream, const pb_field_t *field, void *dest);
-
-bool pb_dec_float(pb_istream_t *stream, const pb_field_t *field, float *dest);
-bool pb_dec_double(pb_istream_t *stream, const pb_field_t *field, double *dest);
+bool pb_dec_varint(pb_istream_t *stream, const pb_field_t *field, void *dest);
+bool pb_dec_svarint(pb_istream_t *stream, const pb_field_t *field, void *dest);
+bool pb_dec_fixed(pb_istream_t *stream, const pb_field_t *field, void *dest);
bool pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, uint8_t *dest);
bool pb_dec_string(pb_istream_t *stream, const pb_field_t *field, uint8_t *dest);
@@ -66,6 +58,6 @@ typedef bool (*pb_decoder_t)(pb_istream_t *stream, const pb_field_t *field, void
/* --- Function pointers to field decoders ---
* Order in the array must match pb_action_t LTYPE numbering.
*/
-const pb_decoder_t PB_DECODERS[16];
+const pb_decoder_t PB_DECODERS[PB_LTYPES_COUNT];
#endif