commit 452e0300a3521f13b6c4ba0b99a8cea3a29209f1
author Markus Armbruster <armbru@redhat.com> Fri Mar 06 19:11:13 2015 +0100
committer Markus Armbruster <armbru@redhat.com> Tue Jun 02 09:59:14 2015 +0200
tree 9acc6d95e9b6f97917c37e6810bc4d065fd0b54e
parent 70ea0c58991ae44b5a1e67d9c189d79029168cb1

monitor: Inline monitor_has_error() into its only caller

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

monitor.c

diff --git a/monitor.c b/monitor.c
index 56564d5..91f8a4e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -377,11 +377,6 @@
     return 0;
 }
 
-static inline int monitor_has_error(const Monitor *mon)
-{
-    return mon->error != NULL;
-}
-
 static void monitor_json_emitter(Monitor *mon, const QObject *data)
 {
     QString *json;
@@ -5031,7 +5026,7 @@
 
     if (cmd->mhandler.cmd_new(mon, args, &data)) {
         /* Command failed... */
-        if (!monitor_has_error(mon)) {
+        if (!mon->error) {
             /* ... without setting an error, so make one up */
             qerror_report(QERR_UNDEFINED_ERROR);
         }