External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: json: Refactor error code class checker

Browse Source 
Split out the function that checks the actual error class string into a
separate helper as it will be useful later and refactor
qemuMonitorJSONHasError to return bool type and remove few useless
checks.

Basically virJSONValueObjectHasKey are useless here since the next call
to virJSONValueObjectGet is checking the return value again (which can't
fail at that point). By removing the first check we save a function
call.
This commit is contained in:
Peter Krempa 2015-04-09 11:26:43 +02:00
parent 64985217bc
commit 72613b18ac
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qemu/qemu_monitor_json.c
View File

@ -400,31 +400,27 @@ qemuMonitorJSONCheckError(virJSONValuePtr cmd,
}
static int
static bool
qemuMonitorJSONErrorIsClass(virJSONValuePtr error,
const char *klass)
{
return STREQ_NULLABLE(virJSONValueObjectGetString(error, "class"), klass);
}
static bool
qemuMonitorJSONHasError(virJSONValuePtr reply,
const char *klass)
{
virJSONValuePtr error;
const char *thisklass;
if (!virJSONValueObjectHasKey(reply, "error"))
return 0;
if (!(error = virJSONValueObjectGet(reply, "error")))
return false;
error = virJSONValueObjectGet(reply, "error");
if (!error)
return 0;
if (!virJSONValueObjectHasKey(error, "class"))
return 0;
thisklass = virJSONValueObjectGetString(error, "class");
if (!thisklass)
return 0;
return STREQ(klass, thisklass);
return qemuMonitorJSONErrorIsClass(error, klass);
}
/* Top-level commands and nested transaction list elements share a
* common structure for everything except the dictionary names. */
static virJSONValuePtr ATTRIBUTE_SENTINEL