Commit 4af8be1f authored by Markus Armbruster's avatar Markus Armbruster Committed by Luiz Capitulino
Browse files

qapi: Drop redundant, unclean error_is_set() 



do_qmp_dispatch()'s test for qmp_dispatch_check_obj() failure examines
both the return value and the error object.  The latter part is
unclean; it works only when do_qmp_dispatch()'s caller passes a
non-null errp argument.  That's the case, but it's not locally
obvious.  Unclean.

Cleanup would be easy enough, but since the unclean code is also
redundant, let's just drop it.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 415168e0

qapi/qmp-dispatch.c

+1 −2
Original line number Diff line number Diff line
@@ -67,9 +67,8 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp) 
    QmpCommand *cmd;

    QObject *ret = NULL;





    dict = qmp_dispatch_check_obj(request, errp);

    if (!dict || error_is_set(errp)) {

    if (!dict) {

        return NULL;

    }