Am 05.03.2014 um 16:55 hat Benoît Canet geschrieben: > The Monday 03 Mar 2014 à 16:28:44 (+0100), Max Reitz wrote : > > This function joins two QDicts by absorbing one into the other. > > > > Signed-off-by: Max Reitz <mre...@redhat.com> > > --- > > include/qapi/qmp/qdict.h | 3 +++ > > qobject/qdict.c | 32 ++++++++++++++++++++++++++++++++ > > 2 files changed, 35 insertions(+) > > > > diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h > > index 1ddf97b..d68f4eb 100644 > > --- a/include/qapi/qmp/qdict.h > > +++ b/include/qapi/qmp/qdict.h > > @@ -16,6 +16,7 @@ > > #include "qapi/qmp/qobject.h" > > #include "qapi/qmp/qlist.h" > > #include "qemu/queue.h" > > +#include <stdbool.h> > > #include <stdint.h> > > > > #define QDICT_BUCKET_MAX 512 > > @@ -70,4 +71,6 @@ void qdict_flatten(QDict *qdict); > > void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start); > > void qdict_array_split(QDict *src, QList **dst); > > > > +void qdict_join(QDict *dest, QDict *src, bool overwrite); > > + > > #endif /* QDICT_H */ > > diff --git a/qobject/qdict.c b/qobject/qdict.c > > index 42ec4c0..ea239f0 100644 > > --- a/qobject/qdict.c > > +++ b/qobject/qdict.c > > @@ -665,3 +665,35 @@ void qdict_array_split(QDict *src, QList **dst) > > qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict)); > > } > > } > > + > > +/** > > + * qdict_join(): Absorb the src QDict into the dest QDict, that is, move > > all > > + * elements from src to dest. > > + * > > + * If an element from src has a key already present in dest, it will not be > > + * moved unless overwrite is true. > > + * > > + * If overwrite is true, the conflicting values in dest will be discarded > > and > > + * replaced by the corresponding values from src. > > + * > > + * Therefore, with overwrite being true, the src QDict will always be > > empty when > > + * this function returns. If overwrite is false, the src QDict will be > > empty > > + * iff there were no conflicts. > s/iff/if/
"iff" means "if and only if" and it seems to be correct here. Kevin