[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/12] qapi: Rename 'fields' to 'members' in generate
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 04/12] qapi: Rename 'fields' to 'members' in generated C code |
Date: |
Fri, 4 Mar 2016 17:45:20 +0100 |
From: Eric Blake <address@hidden>
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>
Message-Id: <address@hidden>
---
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.4.3
- [Qemu-devel] [PULL 00/12] QAPI patches for 2016-03-04, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 04/12] qapi: Rename 'fields' to 'members' in generated C code,
Markus Armbruster <=
- [Qemu-devel] [PULL 10/12] qapi: Avoid use of 'data' member of QAPI unions, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 02/12] qapi-dealloc: Reduce use outside of generated code, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 01/12] qmp-shell: fix pretty printing of JSON responses, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 03/12] qapi: Rename 'fields' to 'members' in generator, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 05/12] qapi-visit: Expose visit_type_FOO_members(), Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 07/12] chardev: Shorten references into ChardevBackend, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 12/12] qapi: Drop useless 'data' member of unions, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 11/12] chardev: Drop useless ChardevDummy type, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 06/12] qapi: Update docs to match recent generator changes, Markus Armbruster, 2016/03/04
- [Qemu-devel] [PULL 08/12] util: Shorten references into SocketAddress, Markus Armbruster, 2016/03/04