3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-28 06:10:53 +08:00
Code Issues Projects Releases Wiki Activity

Cleanup oneof handling

Browse Source 
Small cleanups: pass the oneof case param by value instead of by
reference and use an early return if the case does not match.
This commit is contained in:
Paolo Borelli 2017-04-09 14:15:34 +02:00
parent 39967de734
commit 6bbcc433d5
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 * \param field
* Field descriptor for member. * Field descriptor for member.
* \param oneof_case * \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 * \param member
* Field to encode. * Field to encode.
* \return * \return
@ -474,10 +474,12 @@ required_field_get_packed_size(const ProtobufCFieldDescriptor *field,
*/ */
static size_t static size_t
oneof_field_get_packed_size(const ProtobufCFieldDescriptor *field, oneof_field_get_packed_size(const ProtobufCFieldDescriptor *field,
const uint32_t *oneof_case, uint32_t oneof_case,
const void *member) const void *member)
{ {
if (*oneof_case == field->id) { if (oneof_case != field->id) {
return 0;
}
if (field->type == PROTOBUF_C_TYPE_MESSAGE || if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING) 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) if (ptr == NULL || ptr == field->default_value)
return 0; return 0;
} }
} else {
return 0;
}
return required_field_get_packed_size(field, member); return required_field_get_packed_size(field, member);
} }
@ -678,7 +677,11 @@ size_t protobuf_c_message_get_packed_size(const ProtobufCMessage *message)
} else if ((field->label == PROTOBUF_C_LABEL_OPTIONAL || } else if ((field->label == PROTOBUF_C_LABEL_OPTIONAL ||
field->label == PROTOBUF_C_LABEL_NONE) && field->label == PROTOBUF_C_LABEL_NONE) &&
(0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) { (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) { } else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
rv += optional_field_get_packed_size( rv += optional_field_get_packed_size(
field, field,
@ -1093,7 +1096,7 @@ required_field_pack(const ProtobufCFieldDescriptor *field,
* \param field * \param field
* Field descriptor. * Field descriptor.
* \param oneof_case * \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 * \param member
* The field member. * The field member.
* \param[out] out * \param[out] out
@ -1103,10 +1106,12 @@ required_field_pack(const ProtobufCFieldDescriptor *field,
*/ */
static size_t static size_t
oneof_field_pack(const ProtobufCFieldDescriptor *field, oneof_field_pack(const ProtobufCFieldDescriptor *field,
const uint32_t *oneof_case, uint32_t oneof_case,
const void *member, uint8_t *out) 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 || if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING) field->type == PROTOBUF_C_TYPE_STRING)
{ {
@ -1114,9 +1119,6 @@ oneof_field_pack(const ProtobufCFieldDescriptor *field,
if (ptr == NULL || ptr == field->default_value) if (ptr == NULL || ptr == field->default_value)
return 0; return 0;
} }
} else {
return 0;
}
return required_field_pack(field, member, out); return required_field_pack(field, member, out);
} }
@ -1449,7 +1451,12 @@ protobuf_c_message_pack(const ProtobufCMessage *message, uint8_t *out)
} else if ((field->label == PROTOBUF_C_LABEL_OPTIONAL || } else if ((field->label == PROTOBUF_C_LABEL_OPTIONAL ||
field->label == PROTOBUF_C_LABEL_NONE) && field->label == PROTOBUF_C_LABEL_NONE) &&
(0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) { (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) { } else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
rv += optional_field_pack( rv += optional_field_pack(
field, field,
@ -1598,7 +1605,7 @@ required_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
* \param field * \param field
* Field descriptor. * Field descriptor.
* \param oneof_case * \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 * \param member
* The element to be packed. * The element to be packed.
* \param[out] buffer * \param[out] buffer
@ -1608,10 +1615,12 @@ required_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
*/ */
static size_t static size_t
oneof_field_pack_to_buffer(const ProtobufCFieldDescriptor *field, oneof_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
const uint32_t *oneof_case, uint32_t oneof_case,
const void *member, ProtobufCBuffer *buffer) const void *member, ProtobufCBuffer *buffer)
{ {
if (*oneof_case == field->id) { if (oneof_case != field->id) {
return 0;
}
if (field->type == PROTOBUF_C_TYPE_MESSAGE || if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING) field->type == PROTOBUF_C_TYPE_STRING)
{ {
@ -1619,9 +1628,6 @@ oneof_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
if (ptr == NULL || ptr == field->default_value) if (ptr == NULL || ptr == field->default_value)
return 0; return 0;
} }
} else {
return 0;
}
return required_field_pack_to_buffer(field, member, buffer); return required_field_pack_to_buffer(field, member, buffer);
} }
@ -1930,7 +1936,7 @@ protobuf_c_message_pack_to_buffer(const ProtobufCMessage *message,
(0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) { (0 != (field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF))) {
rv += oneof_field_pack_to_buffer( rv += oneof_field_pack_to_buffer(
field, field,
qmember, *(const uint32_t *) qmember,
member, member,
buffer buffer
); );