Commit f782399c authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Consistent generated code: prefer common labels 



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: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1443565276-4535-13-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent f8b7f1a8

scripts/qapi-event.py

+4 −4
Original line number Diff line number Diff line
@@ -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('''

scripts/qapi-visit.py

+2 −2
Original line number Diff line number Diff line
@@ -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);