[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/10] qapi: Rename 'fields' to 'members' in gene
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 02/10] qapi: Rename 'fields' to 'members' in generated C code |
Date: |
Thu, 3 Mar 2016 09:16:44 -0700 |
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 <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
v3: split out C code changes
v2: new patch
---
scripts/qapi-types.py | 2 +-
scripts/qapi-visit.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 8858d29..19d1fff 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -92,7 +92,7 @@ struct %(c_name)s {
# 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('''
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index b21d3ef..1e52f76 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -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 @@ static void visit_type_%(c_name)s_fields(Visitor *v,
%(c_name)s *obj, Error **er
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 @@ static void visit_type_%(c_name)s_fields(Visitor *v,
%(c_name)s *obj, Error **er
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 @@ void visit_type_%(c_name)s(Visitor *v, const char *name,
%(c_name)s **obj, Error
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 @@ void visit_type_%(c_name)s(Visitor *v, const char *name,
%(c_name)s **obj, Error
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:
--
2.5.0
- [Qemu-devel] [PATCH v3 00/10] easier unboxed visits/qapi implicit types, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 01/10] qapi: Rename 'fields' to 'members' in generator, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 04/10] qapi: Update docs to match recent generator changes, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 03/10] qapi-visit: Expose visit_type_FOO_members(), Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 09/10] chardev: Drop useless ChardevDummy type, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 02/10] qapi: Rename 'fields' to 'members' in generated C code,
Eric Blake <=
- [Qemu-devel] [PATCH v3 05/10] chardev: Shorten references into ChardevBackend, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 08/10] qapi: Avoid use of 'data' member of QAPI unions, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 10/10] qapi: Drop useless 'data' member of unions, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 06/10] util: Shorten references into SocketAddress, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 07/10] ui: Shorten references into InputEvent, Eric Blake, 2016/03/03
- Re: [Qemu-devel] [PATCH v3 00/10] easier unboxed visits/qapi implicit types, Markus Armbruster, 2016/03/04