3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2025-01-14 01:07:57 +08:00
Code Issues Projects Releases Wiki Activity

protobuf-c: Fix -Wdeclaration-after-statement warning in parse_oneof_member()

Browse Source 
* allow compilation with -pedantic (thanks @Bun)

Can be reproduced with the following command:

$ make CFLAGS=-pedantic protobuf-c/protobuf-c.o

* put el-size on a separate line
This commit is contained in:
Jurriaan Bremer 2019-05-18 23:47:23 +02:00 committed by Robert Edmonds
parent c404ce3eb0
commit b8cd15a84f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
protobuf-c/protobuf-c.c
View File

@ -2636,6 +2636,8 @@ parse_oneof_member (ScannedMember *scanned_member,
/* If we have already parsed a member of this oneof, free it. */
if (*oneof_case != 0) {
const ProtobufCFieldDescriptor *old_field;
size_t el_size;
/* lookup field */
int field_index =
int_range_lookup(message->descriptor->n_field_ranges,
@ -2643,9 +2645,8 @@ parse_oneof_member (ScannedMember *scanned_member,
*oneof_case);
if (field_index < 0)
return FALSE;
const ProtobufCFieldDescriptor *old_field =
message->descriptor->fields + field_index;
size_t el_size = sizeof_elt_in_repeated_array(old_field->type);
old_field = message->descriptor->fields + field_index;
el_size = sizeof_elt_in_repeated_array(old_field->type);
switch (old_field->type) {
case PROTOBUF_C_TYPE_STRING: {