[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/20] qapi: Consistent generated code: prefer common
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 15/20] qapi: Consistent generated code: prefer common labels |
Date: |
Fri, 9 Oct 2015 17:14:16 +0200 |
From: Eric Blake <address@hidden>
We had some pointless differences in the generated code for visit,
command marshalling, and events; unifying them makes it easier for
future patches to consolidate to common helper functions.
This is one patch of a series to clean up these differences.
This patch names the goto labels 'out' (not 'clean') and 'out_obj'
(not 'out_end'). Additionally, the generator was inconsistent on
whether labels had a leading space [our HACKING is silent; while
emacs 'gnu' style adds the space to avoid littering column 1].
For minimal churn, prefer no leading space; this also matches
the style that is more prevalent in current qemu.git.
No change in semantics to the generated code.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-event.py | 8 ++++----
scripts/qapi-visit.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index d41af40..b5a9d4f 100644
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -69,7 +69,7 @@ def gen_event_send(name, arg_type):
/* Fake visit, as if all members are under a structure */
visit_start_struct(v, NULL, "", "%(name)s", 0, &err);
if (err) {
- goto clean;
+ goto out;
}
''',
@@ -92,7 +92,7 @@ def gen_event_send(name, arg_type):
ret += mcgen('''
visit_type_%(c_type)s(v, %(cast)s&%(c_name)s, "%(name)s", &err);
if (err) {
- goto clean;
+ goto out;
}
''',
cast=cast,
@@ -110,7 +110,7 @@ def gen_event_send(name, arg_type):
visit_end_struct(v, &err);
if (err) {
- goto clean;
+ goto out;
}
obj = qmp_output_get_qobject(qov);
@@ -127,7 +127,7 @@ def gen_event_send(name, arg_type):
if arg_type and arg_type.members:
ret += mcgen('''
- clean:
+out:
qmp_output_visitor_cleanup(qov);
''')
ret += mcgen('''
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 348efe0..5a453ea 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -209,7 +209,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj,
const char *name, Error
}
visit_get_next_type(v, (int*) &(*obj)->kind, %(c_name)s_qtypes, name,
&err);
if (err) {
- goto out_end;
+ goto out_obj;
}
switch ((*obj)->kind) {
''',
@@ -230,7 +230,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj,
const char *name, Error
default:
abort();
}
-out_end:
+out_obj:
error_propagate(errp, err);
err = NULL;
visit_end_implicit_struct(v, &err);
--
2.4.3
- [Qemu-devel] [PULL 00/20] QAPI patches, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 01/20] docs: Move files from docs/qmp/ to docs/, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 15/20] qapi: Consistent generated code: prefer common labels,
Markus Armbruster <=
- [Qemu-devel] [PULL 12/20] qapi: Reuse code for flat union base validation, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 16/20] qapi: Consistent generated code: prefer common indentation, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 13/20] qapi: Consistent generated code: prefer error 'err', Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 09/20] qapi: Avoid assertion failure on union 'type' collision, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 14/20] qapi: Consistent generated code: prefer visitor 'v', Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 10/20] qapi: Add tests for empty unions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 08/20] qapi: Test for various name collisions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 18/20] qapi: Share gen_err_check(), Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 06/20] qapi: Invoke exception superclass initializer, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 05/20] qapi: Improve 'include' error message, Markus Armbruster, 2015/10/09