diff mbox

[v2,08/15] qapi: Drop redundant, unclean error_is_set()

Message ID 1398716874-18699-9-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster April 28, 2014, 8:27 p.m. UTC 
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 qapi/qmp-dispatch.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Michael Roth April 29, 2014, 9:27 p.m. UTC | #1 
Quoting Markus Armbruster (2014-04-28 15:27:47)
> 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: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
>  qapi/qmp-dispatch.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
> index 141a376..187af56 100644
> --- a/qapi/qmp-dispatch.c
> +++ b/qapi/qmp-dispatch.c
> @@ -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;
>      }
> 
> -- 
> 1.8.1.4
diff mbox

Patch

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 141a376..187af56 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -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;
     }