diff options
| author | Eric Blake <eblake@redhat.com> | 2016-03-03 09:16:43 -0700 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-03-05 10:40:52 +0100 |
| commit | 14f00c6c492488381a513c3816b15794446231a0 (patch) | |
| tree | 731a0989018d6a9f7a312ffd87485d3adba3b070 /scripts/qapi-types.py | |
| parent | 96a1616c85ae62fc13aff85a34effb4b2477b7ce (diff) | |
| download | qemu-14f00c6c492488381a513c3816b15794446231a0.tar.gz | |
qapi: Rename 'fields' to 'members' in generator
C types and JSON objects don't have fields, but members. We
shouldn't gratuitously invent terminology. This patch is a
strict renaming of generator code internals (including testsuite
comments), before later patches rename C interfaces.
No change to generated code with this patch.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1457021813-10704-2-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts/qapi-types.py')
| -rw-r--r-- | scripts/qapi-types.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index eac90d2fe9..8858d290ab 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -38,7 +38,7 @@ struct %(c_name)s { c_name=c_name(name), c_type=element_type.c_type()) -def gen_struct_fields(members): +def gen_struct_members(members): ret = '' for memb in members: if memb.optional: @@ -77,16 +77,16 @@ struct %(c_name)s { /* Members inherited from %(c_name)s: */ ''', c_name=base.c_name()) - ret += gen_struct_fields(base.members) + ret += gen_struct_members(base.members) ret += mcgen(''' /* Own members: */ ''') - ret += gen_struct_fields(members) + ret += gen_struct_members(members) if variants: ret += gen_variants(variants) - # Make sure that all structs have at least one field; this avoids + # Make sure that all structs have at least one member; this avoids # potential issues with attempting to malloc space for zero-length # structs in C, and also incompatibility with C++ (where an empty # struct is size 1). |