motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Consistent generated code: prefer error 'err'

Browse source 
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 consistently names the local error variable 'err' rather
than 'local_err'.

No change in semantics to the generated code.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1443565276-4535-11-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-09-29 16:21:08 -06:00 • committed by Markus Armbruster
parent 376863ef48
commit 2a0f50e8d9
3 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/qapi-event.py
View file

@ -34,7 +34,7 @@ def gen_event_send(name, arg_type):
%(proto)s
{
QDict *qmp;
Error *local_err = NULL;
Error *err = NULL;
QMPEventFuncEmit emit;
''',
proto=gen_event_send_proto(name, arg_type))
@ -67,8 +67,8 @@ def gen_event_send(name, arg_type):
g_assert(v);
/* Fake visit, as if all members are under a structure */
visit_start_struct(v, NULL, "", "%(name)s", 0, &local_err);
if (local_err) {
visit_start_struct(v, NULL, "", "%(name)s", 0, &err);
if (err) {
goto clean;
}
@ -90,8 +90,8 @@ def gen_event_send(name, arg_type):
cast = ''
ret += mcgen('''
visit_type_%(c_type)s(v, %(cast)s&%(c_name)s, "%(name)s", &local_err);
if (local_err) {
visit_type_%(c_type)s(v, %(cast)s&%(c_name)s, "%(name)s", &err);
if (err) {
goto clean;
}
''',
@ -108,8 +108,8 @@ def gen_event_send(name, arg_type):
ret += mcgen('''
visit_end_struct(v, &local_err);
if (local_err) {
visit_end_struct(v, &err);
if (err) {
goto clean;
}
@ -120,7 +120,7 @@ def gen_event_send(name, arg_type):
''')
ret += mcgen('''
emit(%(c_enum)s, qmp, &local_err);
emit(%(c_enum)s, qmp, &err);
''',
c_enum=c_enum_const(event_enum_name, name))
@ -131,7 +131,7 @@ def gen_event_send(name, arg_type):
qmp_output_visitor_cleanup(qov);
''')
ret += mcgen('''
error_propagate(errp, local_err);
error_propagate(errp, err);
QDECREF(qmp);
}
''')