Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add pb_decode_noinit and use it from pb_dec_submessage.
[apps/agl-service-can-low-level.git]
/
pb_decode.c
diff --git
a/pb_decode.c
b/pb_decode.c
index
9d65504
..
601dc74
100644
(file)
--- a/
pb_decode.c
+++ b/
pb_decode.c
@@
-415,13
+415,11
@@
static void pb_message_set_to_defaults(const pb_field_t fields[], void *dest_str
* Decode all fields *
*********************/
* Decode all fields *
*********************/
-bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
+bool checkreturn pb_decode
_noinit
(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
{
uint8_t fields_seen[(PB_MAX_REQUIRED_FIELDS + 7) / 8] = {0}; /* Used to check for required fields */
pb_field_iterator_t iter;
{
uint8_t fields_seen[(PB_MAX_REQUIRED_FIELDS + 7) / 8] = {0}; /* Used to check for required fields */
pb_field_iterator_t iter;
- pb_message_set_to_defaults(fields, dest_struct);
-
pb_field_init(&iter, fields, dest_struct);
while (stream->bytes_left)
pb_field_init(&iter, fields, dest_struct);
while (stream->bytes_left)
@@
-470,6
+468,12
@@
bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_t fields[], void
return true;
}
return true;
}
+bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
+{
+ pb_message_set_to_defaults(fields, dest_struct);
+ return pb_decode_noinit(stream, fields, dest_struct);
+}
+
/* Field decoders */
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest)
/* Field decoders */
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest)
@@
-615,7
+619,7
@@
bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field
if (field->ptr == NULL)
PB_RETURN_ERROR(stream, "invalid field descriptor");
if (field->ptr == NULL)
PB_RETURN_ERROR(stream, "invalid field descriptor");
- status = pb_decode(&substream, (pb_field_t*)field->ptr, dest);
+ status = pb_decode
_noinit
(&substream, (pb_field_t*)field->ptr, dest);
pb_close_string_substream(stream, &substream);
return status;
}
pb_close_string_substream(stream, &substream);
return status;
}