diff mbox

fixup! qapi: Document visitor interfaces, add assertions

Message ID 1462370743-1541-1-git-send-email-eblake@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eric Blake May 4, 2016, 2:05 p.m. UTC 
[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(-)

Comments

Eric Blake May 4, 2016, 2:49 p.m. UTC | #1 
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).
Markus Armbruster May 4, 2016, 3:04 p.m. UTC | #2 
Eric Blake <eblake@redhat.com> writes:

> [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:
>   *  error_propagate(errp, err);
>   *  ...clean up v...
>   * </example>

Squashed in and pushed.  Thanks!
diff mbox

Patch

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:
  *  error_propagate(errp, err);
  *  ...clean up v...
  * </example>