3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-27 22:01:02 +08:00
Code Issues Projects Releases Wiki Activity

turned ProtobufCFieldDescriptor->packed into ->flags

Browse Source
This commit is contained in:
Andrei Nigmatulin 2014-04-02 00:47:08 +01:00 committed by Robert Edmonds
parent db49f8e889
commit 9c6f2fe4d3
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
protobuf-c/protobuf-c.c
View File

@ -388,7 +388,7 @@ repeated_field_get_packed_size(const ProtobufCFieldDescriptor *field,
if (count == 0) if (count == 0)
return 0; return 0;
header_size = get_tag_size(field->id); header_size = get_tag_size(field->id);
if (!field->packed) if (0 == (field->flags & PROTOBUF_C_FIELD_FLAGS_PACKED))
header_size *= count; header_size *= count;
switch (field->type) { switch (field->type) {
@ -449,7 +449,7 @@ repeated_field_get_packed_size(const ProtobufCFieldDescriptor *field,
/* case PROTOBUF_C_TYPE_GROUP: -- NOT SUPPORTED */ /* case PROTOBUF_C_TYPE_GROUP: -- NOT SUPPORTED */
} }
if (field->packed) if (0 != (field->flags & PROTOBUF_C_FIELD_FLAGS_PACKED))
header_size += uint32_size(rv); header_size += uint32_size(rv);
return header_size + rv; return header_size + rv;
} }
@ -872,7 +872,7 @@ repeated_field_pack(const ProtobufCFieldDescriptor *field,
void *array = *(void * const *) member; void *array = *(void * const *) member;
unsigned i; unsigned i;
if (field->packed) { if (0 != (field->flags & PROTOBUF_C_FIELD_FLAGS_PACKED)) {
unsigned header_len; unsigned header_len;
unsigned len_start; unsigned len_start;
unsigned min_length; unsigned min_length;
@ -1300,7 +1300,7 @@ repeated_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
if (count == 0) if (count == 0)
return 0; return 0;
if (field->packed) { if (0 != (field->flags & PROTOBUF_C_FIELD_FLAGS_PACKED)) {
uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2]; uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
size_t rv = tag_pack(field->id, scratch); size_t rv = tag_pack(field->id, scratch);
size_t payload_len = get_packed_payload_length(field, count, array); size_t payload_len = get_packed_payload_length(field, count, array);
@ -2169,7 +2169,7 @@ parse_member(ScannedMember *scanned_member,
case PROTOBUF_C_LABEL_REPEATED: case PROTOBUF_C_LABEL_REPEATED:
if (scanned_member->wire_type == if (scanned_member->wire_type ==
PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED && PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED &&
(field->packed || is_packable_type(field->type))) (0 != (field->flags & PROTOBUF_C_FIELD_FLAGS_PACKED) || is_packable_type(field->type)))
{ {
return parse_packed_repeated_member(scanned_member, return parse_packed_repeated_member(scanned_member,
member, message); member, message);
@ -2446,7 +2446,7 @@ protobuf_c_message_unpack(const ProtobufCMessageDescriptor *desc,
size_t *n = STRUCT_MEMBER_PTR(size_t, rv, size_t *n = STRUCT_MEMBER_PTR(size_t, rv,
field->quantifier_offset); field->quantifier_offset);
if (wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED && if (wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED &&
(field->packed || is_packable_type(field->type))) (0 != (field->flags & PROTOBUF_C_FIELD_FLAGS_PACKED) || is_packable_type(field->type)))
{ {
size_t count; size_t count;
if (!count_packed_elements(field->type, if (!count_packed_elements(field->type,

6
protobuf-c/protobuf-c.h
View File

@ -240,13 +240,17 @@ struct _ProtobufCFieldDescriptor {
unsigned offset; unsigned offset;
const void *descriptor; /* for MESSAGE and ENUM types */ const void *descriptor; /* for MESSAGE and ENUM types */
const void *default_value; /* can be NULL */ const void *default_value; /* can be NULL */
protobuf_c_boolean packed; unsigned flags;
unsigned reserved_flags; unsigned reserved_flags;
void *reserved2; void *reserved2;
void *reserved3; void *reserved3;
}; };
typedef enum {
PROTOBUF_C_FIELD_FLAGS_PACKED = (1 << 0),
} ProtobufCFieldFlagType;
/* /*
* ProtobufCMessageDescriptor: description of a message. * ProtobufCMessageDescriptor: description of a message.
* *

8
protoc-c/c_field.cc
View File

@ -123,12 +123,12 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(io::Printer* printer,
variables["default_value"] = "NULL"; variables["default_value"] = "NULL";
} }
variables["flags"] = "0";
if (descriptor_->label() == FieldDescriptor::LABEL_REPEATED if (descriptor_->label() == FieldDescriptor::LABEL_REPEATED
&& is_packable_type (descriptor_->type()) && is_packable_type (descriptor_->type())
&& descriptor_->options().packed()) && descriptor_->options().packed())
variables["packed"] = "1"; variables["flags"] += " | PROTOBUF_C_FIELD_FLAGS_PACKED";
else
variables["packed"] = "0";
printer->Print(variables, printer->Print(variables,
"{\n" "{\n"
@ -154,7 +154,7 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(io::Printer* printer,
printer->Print(variables, " PROTOBUF_C_OFFSETOF($classname$, $name$),\n"); printer->Print(variables, " PROTOBUF_C_OFFSETOF($classname$, $name$),\n");
printer->Print(variables, " $descriptor_addr$,\n"); printer->Print(variables, " $descriptor_addr$,\n");
printer->Print(variables, " $default_value$,\n"); printer->Print(variables, " $default_value$,\n");
printer->Print(variables, " $packed$, /* packed */\n"); printer->Print(variables, " $flags$, /* flags */\n");
printer->Print(variables, " 0,NULL,NULL /* reserved1,reserved2, etc */\n"); printer->Print(variables, " 0,NULL,NULL /* reserved1,reserved2, etc */\n");
printer->Print("},\n"); printer->Print("},\n");
} }