Re: [Qemu-devel] [PATCH] fixup! qapi: Document visitor interfaces, add assertions

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]

On 05/04/2016 08:05 AM, Eric Blake wrote:
> [no change to commit message]
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>  include/qapi/visitor.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
> index 0bb2fe1..2211637 100644
> --- a/include/qapi/visitor.h
> +++ b/include/qapi/visitor.h
> @@ -174,7 +174,7 @@
>   *  v = ...obtain visitor...
>   *  visit_start_struct(v, NULL, NULL, 0, &err);
>   *  if (err) {
> - *      goto outobj;
> + *      goto out;
>   *  }
>   *  visit_start_list(v, "list", &err);
>   *  if (err) {
> @@ -196,6 +196,7 @@
>   *  error_propagate(errp, err);
>   *  err = NULL;
>   *  visit_end_struct(v, &err);
> + * out:

This also conflicts with 19/24; resolution is pretty obvious (keep the
new out: label after the updated visit_end_struct() call).

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]