diff options
| author | Eric Blake <eblake@redhat.com> | 2016-01-29 06:48:48 -0700 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-02-08 17:29:55 +0100 |
| commit | 7c91aabd8964cfdf637f302c579c95401f21ce92 (patch) | |
| tree | 7f38a8fe67ef887bd1ac6c6d61330737c4fd0389 /include/qapi | |
| parent | 92b09babc11b60458c28cfe37eaa314de50e6241 (diff) | |
| download | qemu-7c91aabd8964cfdf637f302c579c95401f21ce92.zip qemu-7c91aabd8964cfdf637f302c579c95401f21ce92.tar.gz qemu-7c91aabd8964cfdf637f302c579c95401f21ce92.tar.bz2 | |
qapi-visit: Kill unused visit_end_union()
The generated code can call visit_end_union() without having called
visit_start_union(). Example:
if (!*obj) {
goto out_obj;
}
visit_type_CpuInfoBase_fields(v, (CpuInfoBase **)obj, &err);
if (err) {
goto out_obj; // if we go from here...
}
if (!visit_start_union(v, !!(*obj)->u.data, &err) || err) {
goto out_obj;
}
switch ((*obj)->arch) {
[...]
}
out_obj:
// ... then *obj is true, and ...
error_propagate(errp, err);
err = NULL;
if (*obj) {
// we end up here
visit_end_union(v, !!(*obj)->u.data, &err);
}
error_propagate(errp, err);
Harmless only because no visitor implements end_union(). Clean it up
anyway, by deleting the function as useless.
Messed up since we have visit_end_union (commit cee2ded).
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1453902888-20457-3-git-send-email-armbru@redhat.com>
[expand scope of patch to delete rather than repair]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-13-git-send-email-eblake@redhat.com>
Diffstat (limited to 'include/qapi')
| -rw-r--r-- | include/qapi/visitor-impl.h | 1 | ||||
| -rw-r--r-- | include/qapi/visitor.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h index 44a21b7..f314894 100644 --- a/include/qapi/visitor-impl.h +++ b/include/qapi/visitor-impl.h @@ -58,7 +58,6 @@ struct Visitor /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp); bool (*start_union)(Visitor *v, bool data_present, Error **errp); - void (*end_union)(Visitor *v, bool data_present, Error **errp); }; void input_type_enum(Visitor *v, int *obj, const char * const strings[], diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index a14a16d..83ac3ad 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -70,6 +70,5 @@ void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp); void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp); void visit_type_any(Visitor *v, QObject **obj, const char *name, Error **errp); bool visit_start_union(Visitor *v, bool data_present, Error **errp); -void visit_end_union(Visitor *v, bool data_present, Error **errp); #endif |