NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorJSONParseKeywords: remove constant argument

Browse Source 
There's just one caller that always passes '1'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-13 20:54:24 +02:00
parent 26c8b4f1fc
commit 8f2d30e9bc
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_monitor_json.c
View File

@ -604,16 +604,15 @@ qemuMonitorJSONParseKeywordsFree(int nkeywords,
/* /*
* Takes a string containing a set of key=value,key=value,key... * Takes a string containing a set of key=value,key=value,key...
* parameters and splits them up, returning two arrays with * parameters and splits them up, returning two arrays with
* the individual keys and values. If allowEmptyValue is nonzero, * the individual keys and values.
* the "=value" part is optional and if a key with no value is found, * The "=value" part is optional and if a key with no value is found,
* NULL is be placed into corresponding place in retvalues. * NULL will be placed into corresponding place in retvalues.
*/ */
static int static int
qemuMonitorJSONParseKeywords(const char *str, qemuMonitorJSONParseKeywords(const char *str,
char ***retkeywords, char ***retkeywords,
char ***retvalues, char ***retvalues,
int *retnkeywords, int *retnkeywords)
int allowEmptyValue)
{ {
int keywordCount = 0; int keywordCount = 0;
int keywordAlloc = 0; int keywordAlloc = 0;
@ -645,14 +644,8 @@ qemuMonitorJSONParseKeywords(const char *str,
if (!(separator = strchr(start, '='))) if (!(separator = strchr(start, '=')))
separator = end; separator = end;
if (separator >= endmark) { if (separator >= endmark)
if (!allowEmptyValue) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("malformed keyword arguments in '%s'"), str);
goto error;
}
separator = endmark; separator = endmark;
}
keyword = g_strndup(start, separator - start); keyword = g_strndup(start, separator - start);
@ -708,7 +701,7 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword)
int nkeywords = 0; int nkeywords = 0;
size_t i; size_t i;
if (qemuMonitorJSONParseKeywords(str, &keywords, &values, &nkeywords, 1) < 0) if (qemuMonitorJSONParseKeywords(str, &keywords, &values, &nkeywords) < 0)
goto error; goto error;
for (i = 0; i < nkeywords; i++) { for (i = 0; i < nkeywords; i++) {