From ec3bff4ba110ffad31fccdbf74c4c180fc041414 Mon Sep 17 00:00:00 2001 From: Petteri Aimonen Date: Mon, 4 Aug 2014 18:40:40 +0300 Subject: Generate #defines for initializing message structures. Usage like: MyMessage foo = MyMessage_init_default; MyMessage_init_default will initialize to default values defined in .proto. MyMessage_init_zero will initialize to null/zero values. Same results as {} or {0}, but will avoid compiler warnings by initializing everything explicitly. Update issue 79 Status: FixedInGit --- tests/alltypes/decode_alltypes.c | 3 ++- tests/alltypes/encode_alltypes.c | 2 +- tests/basic_buffer/decode_buffer.c | 2 +- tests/basic_stream/decode_stream.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/alltypes/decode_alltypes.c b/tests/alltypes/decode_alltypes.c index 0202ebc..67cb72c 100644 --- a/tests/alltypes/decode_alltypes.c +++ b/tests/alltypes/decode_alltypes.c @@ -19,7 +19,8 @@ the decoding and checks the fields. */ bool check_alltypes(pb_istream_t *stream, int mode) { - AllTypes alltypes; + /* Uses _init_default to just make sure that it works. */ + AllTypes alltypes = AllTypes_init_default; /* Fill with garbage to better detect initialization errors */ memset(&alltypes, 0xAA, sizeof(alltypes)); diff --git a/tests/alltypes/encode_alltypes.c b/tests/alltypes/encode_alltypes.c index fa8eec9..deec790 100644 --- a/tests/alltypes/encode_alltypes.c +++ b/tests/alltypes/encode_alltypes.c @@ -13,7 +13,7 @@ int main(int argc, char **argv) int mode = (argc > 1) ? atoi(argv[1]) : 0; /* Initialize the structure with constants */ - AllTypes alltypes = {0}; + AllTypes alltypes = AllTypes_init_zero; alltypes.req_int32 = -1001; alltypes.req_int64 = -1002; diff --git a/tests/basic_buffer/decode_buffer.c b/tests/basic_buffer/decode_buffer.c index fae9e2f..291d164 100644 --- a/tests/basic_buffer/decode_buffer.c +++ b/tests/basic_buffer/decode_buffer.c @@ -16,7 +16,7 @@ bool print_person(pb_istream_t *stream) { int i; - Person person; + Person person = Person_init_zero; if (!pb_decode(stream, Person_fields, &person)) return false; diff --git a/tests/basic_stream/decode_stream.c b/tests/basic_stream/decode_stream.c index 667bf3c..798dcc5 100644 --- a/tests/basic_stream/decode_stream.c +++ b/tests/basic_stream/decode_stream.c @@ -12,7 +12,7 @@ bool print_person(pb_istream_t *stream) { int i; - Person person; + Person person = Person_init_zero; if (!pb_decode(stream, Person_fields, &person)) return false; -- cgit 1.2.3-korg