openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qapi: Rename 'fields' to 'members' in generated C code 

C types and JSON objects don't have fields, but members.  We
shouldn't gratuitously invent terminology.  This patch is a
strict renaming of static genarated functions, plus the naming
of the dummy filler member for empty structs, before the next
patch exposes some of that naming to the rest of the code base.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1457021813-10704-3-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-03-03 09:16:44 -07:00 committed by Markus Armbruster
parent 14f00c6c49
commit c81200b014
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/qapi-types.py
View File

@ -92,7 +92,7 @@ def gen_object(name, base, members, variants):
# struct is size 1).
if not (base and base.members) and not members and not variants:
ret += mcgen('''
char qapi_dummy_field_for_empty_struct;
char qapi_dummy_for_empty_struct;
''')
ret += mcgen('''

12
scripts/qapi-visit.py
View File

@ -36,7 +36,7 @@ def gen_visit_members_decl(typ):
object_members_seen.add(typ.name)
return mcgen('''
static void visit_type_%(c_type)s_fields(Visitor *v, %(c_type)s *obj, Error **errp);
static void visit_type_%(c_type)s_members(Visitor *v, %(c_type)s *obj, Error **errp);
''',
c_type=typ.c_name())
@ -55,7 +55,7 @@ def gen_visit_object_members(name, base, members, variants):
object_members_seen.add(name)
ret += mcgen('''
static void visit_type_%(c_name)s_fields(Visitor *v, %(c_name)s *obj, Error **errp)
static void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)
{
Error *err = NULL;
@ -64,7 +64,7 @@ def gen_visit_object_members(name, base, members, variants):
if base:
ret += mcgen('''
visit_type_%(c_type)s_fields(v, (%(c_type)s *)obj, &err);
visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, &err);
''',
c_type=base.c_name())
ret += gen_err_check()
@ -94,7 +94,7 @@ def gen_visit_object_members(name, base, members, variants):
c_name=c_name(var.name))
else:
ret += mcgen('''
visit_type_%(c_type)s_fields(v, &obj->u.%(c_name)s, &err);
visit_type_%(c_type)s_members(v, &obj->u.%(c_name)s, &err);
''',
c_type=var.type.c_name(),
c_name=c_name(var.name))
@ -202,7 +202,7 @@ def gen_visit_alternate(name, variants):
if (err) {
break;
}
visit_type_%(c_type)s_fields(v, &(*obj)->u.%(c_name)s, &err);
visit_type_%(c_type)s_members(v, &(*obj)->u.%(c_name)s, &err);
error_propagate(errp, err);
err = NULL;
visit_end_struct(v, &err);
@ -254,7 +254,7 @@ def gen_visit_object(name, base, members, variants):
if (!*obj) {
goto out_obj;
}
visit_type_%(c_name)s_fields(v, *obj, &err);
visit_type_%(c_name)s_members(v, *obj, &err);
error_propagate(errp, err);
err = NULL;
out_obj: