From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axy7K-0001LF-RM for qemu-devel@nongnu.org; Wed, 04 May 2016 10:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axy78-00074r-UC for qemu-devel@nongnu.org; Wed, 04 May 2016 10:49:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axy78-00072A-Om for qemu-devel@nongnu.org; Wed, 04 May 2016 10:49:22 -0400 References: <1461879932-9020-13-git-send-email-eblake@redhat.com> <1462370743-1541-1-git-send-email-eblake@redhat.com> From: Eric Blake Message-ID: <572A0BE6.7000607@redhat.com> Date: Wed, 4 May 2016 08:49:10 -0600 MIME-Version: 1.0 In-Reply-To: <1462370743-1541-1-git-send-email-eblake@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wXWnQtAjbNPkd96NwMGpU43FEgcP4J3ML" Subject: Re: [Qemu-devel] [PATCH] fixup! qapi: Document visitor interfaces, add assertions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wXWnQtAjbNPkd96NwMGpU43FEgcP4J3ML Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 05/04/2016 08:05 AM, Eric Blake wrote: > [no change to commit message] >=20 > Signed-off-by: Eric Blake > --- > include/qapi/visitor.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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 =3D ...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 =3D 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). --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --wXWnQtAjbNPkd96NwMGpU43FEgcP4J3ML Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXKgvmAAoJEKeha0olJ0Nq6fkH/2VZrxzFwaLouJQondQxkWT3 P2FbTs656vhLD/7pjpXp65DMLZMzmmtZKg0iDP2I0re+jgEiyUgCTwTePdqVcLiu rs1aqtKHboMBVv4RqRLP+3G4cLJeCS9depsGTGzcWO4tfeyLDk7atj/W+xxQGdyk PfLGjwxgG+BFWvZFaEsuNlR24034tfhRLCk9kuaSO8h6sjiz6KaPTLFMKgQgvX0a 6zAt1llkcg3DnEopVg3PLMIFUTLFvjCNgLf6smHA/NnMA6SPaPEALHIhebupbalI /0NSfq3QSYt4yxH92Qlm3xs6GZX1c/zLZ2GRONF4sC/09MzwjdmOYFP/y/dKFkM= =URwa -----END PGP SIGNATURE----- --wXWnQtAjbNPkd96NwMGpU43FEgcP4J3ML--