summaryrefslogtreecommitdiffstats
path: root/pb_decode.c
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-08-26 10:05:46 +0300
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-08-26 10:05:46 +0300
commit1463e687e36c8dd404d33c6ef1cba61b574adc1e (patch)
treeb693330c9fe94b312f1068a7e69bcaf59b7c6edb /pb_decode.c
parentf1d7640fe1be0f150f604c72108ea516222c2505 (diff)
Revert "Add pb_decode_noinit and use it from pb_dec_submessage."
The patch breaks default values inside submessage arrays (I think). Have to add test cases and check back. This reverts commit f1d7640fe1be0f150f604c72108ea516222c2505.
Diffstat (limited to 'pb_decode.c')
-rw-r--r--pb_decode.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/pb_decode.c b/pb_decode.c
index 601dc742..9d65504c 100644
--- a/pb_decode.c
+++ b/pb_decode.c
@@ -415,11 +415,13 @@ static void pb_message_set_to_defaults(const pb_field_t fields[], void *dest_str
* Decode all fields *
*********************/
-bool checkreturn pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
+bool checkreturn pb_decode(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;
+ pb_message_set_to_defaults(fields, dest_struct);
+
pb_field_init(&iter, fields, dest_struct);
while (stream->bytes_left)
@@ -468,12 +470,6 @@ bool checkreturn pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[
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)
@@ -619,7 +615,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");
- status = pb_decode_noinit(&substream, (pb_field_t*)field->ptr, dest);
+ status = pb_decode(&substream, (pb_field_t*)field->ptr, dest);
pb_close_string_substream(stream, &substream);
return status;
}