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

Merge pull request #265 from pbor/wip/cleanup

Browse Source 
Small cleanup in oneof handling
This commit is contained in:
Robert Edmonds 2017-04-09 09:44:46 -07:00 committed by GitHub
commit 0014b7c046
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
protobuf-c/protobuf-c.c
View File

@ -466,7 +466,7 @@ required_field_get_packed_size(const ProtobufCFieldDescriptor *field,
* \param field
* Field descriptor for member.
* \param oneof_case
* A pointer to the case enum that selects the field in the oneof.
* Enum value that selects the field in the oneof.
* \param member
* Field to encode.
* \return
@ -474,10 +474,12 @@ required_field_get_packed_size(const ProtobufCFieldDescriptor *field,
*/
static size_t
oneof_field_get_packed_size(const ProtobufCFieldDescriptor *field,
const uint32_t *oneof_case,
uint32_t oneof_case,
const void *member)
{
if (*oneof_case == field->id) {
if (oneof_case != field->id) {
return 0;
}
if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING)
{
@ -485,9 +487,6 @@ oneof_field_get_packed_size(const ProtobufCFieldDescriptor *field,
if (ptr == NULL || ptr == field->default_value)
return 0;
}
} else {
return 0;
}
return required_field_get_packed_size(field, member);
}
@ -690,7 +689,11 @@ size_t protobuf_c_message_get_packed_size(const ProtobufCMessage *message)
} else if ((field->label == PROTOBUF_C_LABEL_OPTIONAL ||
field->label == PROTOBUF_C_LABEL_NONE) &&
(0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) {
rv += oneof_field_get_packed_size(field, qmember, member);
rv += oneof_field_get_packed_size(
field,
*(const uint32_t *) qmember,
member
);
} else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
rv += optional_field_get_packed_size(
field,
@ -1105,7 +1108,7 @@ required_field_pack(const ProtobufCFieldDescriptor *field,
* \param field
* Field descriptor.
* \param oneof_case
* A pointer to the case enum that selects the field in the oneof.
* Enum value that selects the field in the oneof.
* \param member
* The field member.
* \param[out] out
@ -1115,10 +1118,12 @@ required_field_pack(const ProtobufCFieldDescriptor *field,
*/
static size_t
oneof_field_pack(const ProtobufCFieldDescriptor *field,
const uint32_t *oneof_case,
uint32_t oneof_case,
const void *member, uint8_t *out)
{
if (*oneof_case == field->id) {
if (oneof_case != field->id) {
return 0;
}
if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING)
{
@ -1126,9 +1131,6 @@ oneof_field_pack(const ProtobufCFieldDescriptor *field,
if (ptr == NULL || ptr == field->default_value)
return 0;
}
} else {
return 0;
}
return required_field_pack(field, member, out);
}
@ -1459,7 +1461,12 @@ protobuf_c_message_pack(const ProtobufCMessage *message, uint8_t *out)
} else if ((field->label == PROTOBUF_C_LABEL_OPTIONAL ||
field->label == PROTOBUF_C_LABEL_NONE) &&
(0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) {
rv += oneof_field_pack (field, qmember, member, out + rv);
rv += oneof_field_pack(
field,
*(const uint32_t *) qmember,
member,
out + rv
);
} else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
rv += optional_field_pack(
field,
@ -1608,7 +1615,7 @@ required_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
* \param field
* Field descriptor.
* \param oneof_case
* A pointer to the case enum that selects the field in the oneof.
* Enum value that selects the field in the oneof.
* \param member
* The element to be packed.
* \param[out] buffer
@ -1618,10 +1625,12 @@ required_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
*/
static size_t
oneof_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
const uint32_t *oneof_case,
uint32_t oneof_case,
const void *member, ProtobufCBuffer *buffer)
{
if (*oneof_case == field->id) {
if (oneof_case != field->id) {
return 0;
}
if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING)
{
@ -1629,9 +1638,6 @@ oneof_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
if (ptr == NULL || ptr == field->default_value)
return 0;
}
} else {
return 0;
}
return required_field_pack_to_buffer(field, member, buffer);
}
@ -1938,7 +1944,7 @@ protobuf_c_message_pack_to_buffer(const ProtobufCMessage *message,
(0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) {
rv += oneof_field_pack_to_buffer(
field,
qmember,
*(const uint32_t *) qmember,
member,
buffer
);