diff options
author | Chris Fallin <cfallin@c1f.net> | 2015-01-06 18:01:32 -0800 |
---|---|---|
committer | Chris Fallin <cfallin@c1f.net> | 2015-01-06 18:01:32 -0800 |
commit | 80276ac0218f6d8fcdbad0fb09b233b31d2bc0fb (patch) | |
tree | 9500a829302bcc5c490aeb28c0fbe77b580b424f /ruby/ext/google/protobuf_c/storage.c | |
parent | fd1a3ff11d5854c34ba66c63598cdc5fd234e399 (diff) | |
download | protobuf-80276ac0218f6d8fcdbad0fb09b233b31d2bc0fb.tar.gz protobuf-80276ac0218f6d8fcdbad0fb09b233b31d2bc0fb.tar.bz2 protobuf-80276ac0218f6d8fcdbad0fb09b233b31d2bc0fb.zip |
Addressed code-review comments.
Diffstat (limited to 'ruby/ext/google/protobuf_c/storage.c')
-rw-r--r-- | ruby/ext/google/protobuf_c/storage.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ruby/ext/google/protobuf_c/storage.c b/ruby/ext/google/protobuf_c/storage.c index f20ddec2..235fbff2 100644 --- a/ruby/ext/google/protobuf_c/storage.c +++ b/ruby/ext/google/protobuf_c/storage.c @@ -339,15 +339,23 @@ bool is_map_field(const upb_fielddef* field) { const upb_fielddef* map_field_key(const upb_fielddef* field) { assert(is_map_field(field)); const upb_msgdef* subdef = (const upb_msgdef*)upb_fielddef_subdef(field); - const upb_fielddef* key_field = upb_msgdef_itof(subdef, 1); - assert(key_field != NULL); - return key_field; + return map_entry_key(subdef); } const upb_fielddef* map_field_value(const upb_fielddef* field) { assert(is_map_field(field)); const upb_msgdef* subdef = (const upb_msgdef*)upb_fielddef_subdef(field); - const upb_fielddef* value_field = upb_msgdef_itof(subdef, 2); + return map_entry_value(subdef); +} + +const upb_fielddef* map_entry_key(const upb_msgdef* msgdef) { + const upb_fielddef* key_field = upb_msgdef_itof(msgdef, MAP_KEY_FIELD); + assert(key_field != NULL); + return key_field; +} + +const upb_fielddef* map_entry_value(const upb_msgdef* msgdef) { + const upb_fielddef* value_field = upb_msgdef_itof(msgdef, MAP_VALUE_FIELD); assert(value_field != NULL); return value_field; } |