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>
This commit is contained in:
parent
70ea0c5899
commit
452e0300a3
|
@ -377,11 +377,6 @@ static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream,
|
||||||
return 0;
|
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)
|
static void monitor_json_emitter(Monitor *mon, const QObject *data)
|
||||||
{
|
{
|
||||||
QString *json;
|
QString *json;
|
||||||
|
@ -5031,7 +5026,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
|
||||||
|
|
||||||
if (cmd->mhandler.cmd_new(mon, args, &data)) {
|
if (cmd->mhandler.cmd_new(mon, args, &data)) {
|
||||||
/* Command failed... */
|
/* Command failed... */
|
||||||
if (!monitor_has_error(mon)) {
|
if (!mon->error) {
|
||||||
/* ... without setting an error, so make one up */
|
/* ... without setting an error, so make one up */
|
||||||
qerror_report(QERR_UNDEFINED_ERROR);
|
qerror_report(QERR_UNDEFINED_ERROR);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue