mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdict: Make qdict_extract_subqdict() accept dst = NULL

Browse Source 
This function extracts all options from a QDict starting with a
certain prefix and puts them in a new QDict.

We'll have a couple of cases where we simply want to discard those
options instead of copying them, and that's what this patch does.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alberto Garcia 2018-06-29 14:36:59 +03:00 committed by Kevin Wolf
parent f66b1f0e27
commit 655b4b67e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qobject/block-qdict.c
View File

@ -158,20 +158,25 @@ void qdict_flatten(QDict *qdict)
qdict_flatten_qdict(qdict, qdict, NULL); qdict_flatten_qdict(qdict, qdict, NULL);
} }
/* extract all the src QDict entries starting by start into dst */ /* extract all the src QDict entries starting by start into dst.
* If dst is NULL then the entries are simply removed from src. */
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start) void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)
{ {
const QDictEntry *entry, *next; const QDictEntry *entry, *next;
const char *p; const char *p;
*dst = qdict_new(); if (dst) {
*dst = qdict_new();
}
entry = qdict_first(src); entry = qdict_first(src);
while (entry != NULL) { while (entry != NULL) {
next = qdict_next(src, entry); next = qdict_next(src, entry);
if (strstart(entry->key, start, &p)) { if (strstart(entry->key, start, &p)) {
qdict_put_obj(*dst, p, qobject_ref(entry->value)); if (dst) {
qdict_put_obj(*dst, p, qobject_ref(entry->value));
}
qdict_del(src, entry->key); qdict_del(src, entry->key);
} }
entry = next; entry = next;