diff options
| author | Eric Blake <eblake@redhat.com> | 2016-01-29 06:48:57 -0700 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-02-08 17:29:57 +0100 |
| commit | 337283dffbb5ad5860ed00408a5fd0665c21be07 (patch) | |
| tree | 9f98622d9408d8715271e9f960f1fb1d0c6fd745 /include/qapi | |
| parent | 0b2a0d6bb2446060944061e53e87d0c7addede79 (diff) | |
qapi: Drop unused 'kind' for struct/enum visit
visit_start_struct() and visit_type_enum() had a 'kind' argument
that was usually set to either the stringized version of the
corresponding qapi type name, or to NULL (although some clients
didn't even get that right). But nothing ever used the argument.
It's even hard to argue that it would be useful in a debugger,
as a stack backtrace also tells which type is being visited.
Therefore, drop the 'kind' argument as dead.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-22-git-send-email-eblake@redhat.com>
[Harmless rebase mistake cleaned up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'include/qapi')
| -rw-r--r-- | include/qapi/visitor-impl.h | 11 | ||||
| -rw-r--r-- | include/qapi/visitor.h | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h index 734cc13854..337f99973f 100644 --- a/include/qapi/visitor-impl.h +++ b/include/qapi/visitor-impl.h @@ -19,7 +19,7 @@ struct Visitor { /* Must be set */ void (*start_struct)(Visitor *v, const char *name, void **obj, - const char *kind, size_t size, Error **errp); + size_t size, Error **errp); void (*end_struct)(Visitor *v, Error **errp); void (*start_implicit_struct)(Visitor *v, void **obj, size_t size, @@ -31,8 +31,7 @@ struct Visitor void (*end_list)(Visitor *v, Error **errp); void (*type_enum)(Visitor *v, const char *name, int *obj, - const char *const strings[], const char *kind, - Error **errp); + const char *const strings[], Error **errp); /* May be NULL; only needed for input visitors. */ void (*get_next_type)(Visitor *v, const char *name, QType *type, bool promote_int, Error **errp); @@ -61,10 +60,8 @@ struct Visitor }; void input_type_enum(Visitor *v, const char *name, int *obj, - const char *const strings[], const char *kind, - Error **errp); + const char *const strings[], Error **errp); void output_type_enum(Visitor *v, const char *name, int *obj, - const char *const strings[], const char *kind, - Error **errp); + const char *const strings[], Error **errp); #endif diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 0b5cd4179e..997555dbd7 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -28,7 +28,7 @@ typedef struct GenericList } GenericList; void visit_start_struct(Visitor *v, const char *name, void **obj, - const char *kind, size_t size, Error **errp); + size_t size, Error **errp); void visit_end_struct(Visitor *v, Error **errp); void visit_start_implicit_struct(Visitor *v, void **obj, size_t size, Error **errp); @@ -54,8 +54,7 @@ bool visit_optional(Visitor *v, const char *name, bool *present); void visit_get_next_type(Visitor *v, const char *name, QType *type, bool promote_int, Error **errp); void visit_type_enum(Visitor *v, const char *name, int *obj, - const char *const strings[], const char *kind, - Error **errp); + const char *const strings[], Error **errp); void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp); void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj, Error **errp); |