diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2015-05-13 17:14:07 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-06-19 18:42:18 +0200 |
| commit | 2e4450ff432daef524cb3557fca68a3b7b5c7823 (patch) | |
| tree | c900fd8fbef7456b29aaefdc20e91063abcbb3a0 /include/qapi | |
| parent | a31bdae5a76ecc060c1eb8a66be1896072c1e8b2 (diff) | |
| download | qemu-2e4450ff432daef524cb3557fca68a3b7b5c7823.zip qemu-2e4450ff432daef524cb3557fca68a3b7b5c7823.tar.gz qemu-2e4450ff432daef524cb3557fca68a3b7b5c7823.tar.bz2 | |
qom: Make enum string tables const-correct
The enum string table parameters in various QOM/QAPI methods
are declared 'const char *strings[]'. This results in const
warnings if passed a variable that was declared as
static const char * const strings[] = { .... };
Add the extra const annotation to the parameters, since
neither the string elements, nor the array itself should
ever be modified.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/qapi')
| -rw-r--r-- | include/qapi/util.h | 2 | ||||
| -rw-r--r-- | include/qapi/visitor-impl.h | 6 | ||||
| -rw-r--r-- | include/qapi/visitor.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/qapi/util.h b/include/qapi/util.h index de9238b..7ad26c0 100644 --- a/include/qapi/util.h +++ b/include/qapi/util.h @@ -11,7 +11,7 @@ #ifndef QAPI_UTIL_H #define QAPI_UTIL_H -int qapi_enum_parse(const char *lookup[], const char *buf, +int qapi_enum_parse(const char * const lookup[], const char *buf, int max, int def, Error **errp); #endif diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h index 09bb0fd..f4a2f74 100644 --- a/include/qapi/visitor-impl.h +++ b/include/qapi/visitor-impl.h @@ -30,7 +30,7 @@ struct Visitor GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp); void (*end_list)(Visitor *v, Error **errp); - void (*type_enum)(Visitor *v, int *obj, const char *strings[], + void (*type_enum)(Visitor *v, int *obj, const char * const strings[], const char *kind, const char *name, Error **errp); void (*get_next_type)(Visitor *v, int *kind, const int *qobjects, const char *name, Error **errp); @@ -59,9 +59,9 @@ struct Visitor void (*end_union)(Visitor *v, bool data_present, Error **errp); }; -void input_type_enum(Visitor *v, int *obj, const char *strings[], +void input_type_enum(Visitor *v, int *obj, const char * const strings[], const char *kind, const char *name, Error **errp); -void output_type_enum(Visitor *v, int *obj, const char *strings[], +void output_type_enum(Visitor *v, int *obj, const char * const strings[], const char *kind, const char *name, Error **errp); #endif diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 5934f59..00ba104 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -43,7 +43,7 @@ void visit_optional(Visitor *v, bool *present, const char *name, Error **errp); void visit_get_next_type(Visitor *v, int *obj, const int *qtypes, const char *name, Error **errp); -void visit_type_enum(Visitor *v, int *obj, const char *strings[], +void visit_type_enum(Visitor *v, int *obj, const char * const strings[], const char *kind, const char *name, Error **errp); void visit_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp); void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp); |