diff options
author | Joshua Haberman <joshua@reverberate.org> | 2009-07-03 11:50:13 -0700 |
---|---|---|
committer | Joshua Haberman <joshua@reverberate.org> | 2009-07-03 11:50:13 -0700 |
commit | aecbfe42243ccd06425f021df6fe8d8d65974db7 (patch) | |
tree | ce93d0c7d342895b1603693309ec44b8fe7d80a8 /upb_enum.h | |
parent | 62be5969a14b36e4f3ca336ec57c4627f541a69c (diff) |
Moved upb_enum to a proper C file, updated upb_inlinedefs.
Diffstat (limited to 'upb_enum.h')
-rw-r--r-- | upb_enum.h | 25 |
1 files changed, 3 insertions, 22 deletions
@@ -34,27 +34,8 @@ struct upb_enum_iton_entry { /* Initializes and frees an enum, respectively. Caller retains ownership of * ed, but it must outlive e. */ -INLINE void upb_enum_init(struct upb_enum *e, - struct google_protobuf_EnumDescriptorProto *ed) { - int num_values = ed->set_flags.has.value ? ed->value->len : 0; - e->descriptor = ed; - upb_strtable_init(&e->nametoint, num_values, sizeof(struct upb_enum_ntoi_entry)); - upb_inttable_init(&e->inttoname, num_values, sizeof(struct upb_enum_iton_entry)); - - for(int i = 0; i < num_values; i++) { - google_protobuf_EnumValueDescriptorProto *value = ed->value->elements[i]; - struct upb_enum_ntoi_entry ntoi_entry = {.e = {.key = *value->name}, - .value = value->number}; - struct upb_enum_iton_entry iton_entry = {.e = {.key = value->number}, - .string = value->name}; - upb_strtable_insert(&e->nametoint, &ntoi_entry.e); - upb_inttable_insert(&e->inttoname, &iton_entry.e); - } -} - -INLINE void upb_enum_free(struct upb_enum *e) { - upb_strtable_free(&e->nametoint); - upb_inttable_free(&e->inttoname); -} +void upb_enum_init(struct upb_enum *e, + struct google_protobuf_EnumDescriptorProto *ed); +void upb_enum_free(struct upb_enum *e); #endif /* UPB_ENUM_H_ */ |