yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-10 09:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Backports commit 2a0f50e8d973b01eda4c63bac4a5c79ea0f584ef from qemu
This commit is contained in:
Eric Blake 2018-02-19 18:12:13 -05:00 committed by Lioncash
parent 4294815ee3
commit bc8a7ae5f9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qemu/scripts/qapi-event.py
View file

@ -47,7 +47,7 @@ def generate_event_implement(api_name, event_name, params):
%(api_name)s %(api_name)s
{ {
QDict *qmp; QDict *qmp;
Error *local_err = NULL; Error *err = NULL;
QMPEventFuncEmit emit; QMPEventFuncEmit emit;
""", """,
api_name = api_name) api_name = api_name)
@ -82,8 +82,8 @@ def generate_event_implement(api_name, event_name, params):
g_assert(v); g_assert(v);
/* Fake visit, as if all members are under a structure */ /* Fake visit, as if all members are under a structure */
visit_start_struct(v, NULL, "", "%(event_name)s", 0, &local_err); visit_start_struct(v, NULL, "", "%(event_name)s", 0, &err);
if (local_err) { if (err) {
goto clean; goto clean;
} }
@ -104,8 +104,8 @@ def generate_event_implement(api_name, event_name, params):
var_type = "" var_type = ""
ret += mcgen(""" ret += mcgen("""
visit_type_%(type)s(v, %(var_type)s&%(var)s, "%(name)s", &local_err); visit_type_%(type)s(v, %(var_type)s&%(var)s, "%(name)s", &err);
if (local_err) { if (err) {
goto clean; goto clean;
} }
""", """,
@ -122,8 +122,8 @@ def generate_event_implement(api_name, event_name, params):
ret += mcgen(""" ret += mcgen("""
visit_end_struct(v, &local_err); visit_end_struct(v, &err);
if (local_err) { if (err) {
goto clean; goto clean;
} }
@ -135,7 +135,7 @@ def generate_event_implement(api_name, event_name, params):
# step 4: call qmp event api # step 4: call qmp event api
ret += mcgen(""" ret += mcgen("""
emit(%(event_enum_value)s, qmp, &local_err); emit(%(event_enum_value)s, qmp, &err);
""", """,
event_enum_value = c_enum_const(event_enum_name, event_name)) event_enum_value = c_enum_const(event_enum_name, event_name))
@ -147,7 +147,7 @@ def generate_event_implement(api_name, event_name, params):
qmp_output_visitor_cleanup(qov); qmp_output_visitor_cleanup(qov);
""") """)
ret += mcgen(""" ret += mcgen("""
error_propagate(errp, local_err); error_propagate(errp, err);
QDECREF(qmp); QDECREF(qmp);
} }
""") """)