Marc-André Lureau <[email protected]> writes: > On Thu, Apr 27, 2017 at 12:41 PM Markus Armbruster <[email protected]> > wrote: > >> Signed-off-by: Markus Armbruster <[email protected]> >> > > It would be more obvious with a check for qobject_type(tos->obj), no?
--verbose? > In any case: > Reviewed-by: Marc-André Lureau <[email protected]> Thanks! >> --- >> qapi/qobject-input-visitor.c | 21 +++++++++++++++++++-- >> 1 file changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c >> index 2530959..68a6742 100644 >> --- a/qapi/qobject-input-visitor.c >> +++ b/qapi/qobject-input-visitor.c >> @@ -291,6 +291,15 @@ static void qobject_input_start_struct(Visitor *v, >> const char *name, void **obj, >> } >> } >> >> +static void qobject_input_end_struct(Visitor *v, void **obj) >> +{ >> + QObjectInputVisitor *qiv = to_qiv(v); >> + StackObject *tos = QSLIST_FIRST(&qiv->stack); >> + >> + assert(tos->h); >> + qobject_input_pop(v, obj); >> +} >> + >> >> static void qobject_input_start_list(Visitor *v, const char *name, >> GenericList **list, size_t size, >> @@ -346,6 +355,14 @@ static void qobject_input_check_list(Visitor *v, >> Error **errp) >> } >> } >> >> +static void qobject_input_end_list(Visitor *v, void **obj) >> +{ >> + QObjectInputVisitor *qiv = to_qiv(v); >> + StackObject *tos = QSLIST_FIRST(&qiv->stack); >> + >> + assert(!tos->h); >> + qobject_input_pop(v, obj); >> +} >> >> static void qobject_input_start_alternate(Visitor *v, const char *name, >> GenericAlternate **obj, size_t >> size, >> @@ -645,11 +662,11 @@ static QObjectInputVisitor >> *qobject_input_visitor_base_new(QObject *obj) >> v->visitor.type = VISITOR_INPUT; >> v->visitor.start_struct = qobject_input_start_struct; >> v->visitor.check_struct = qobject_input_check_struct; >> - v->visitor.end_struct = qobject_input_pop; >> + v->visitor.end_struct = qobject_input_end_struct; >> v->visitor.start_list = qobject_input_start_list; >> v->visitor.next_list = qobject_input_next_list; >> v->visitor.check_list = qobject_input_check_list; >> - v->visitor.end_list = qobject_input_pop; >> + v->visitor.end_list = qobject_input_end_list; >> v->visitor.start_alternate = qobject_input_start_alternate; >> v->visitor.optional = qobject_input_optional; >> v->visitor.free = qobject_input_free; >> -- >> 2.7.4 >> >> >> -- > Marc-André Lureau
