diff options
Diffstat (limited to 'qapi/qapi-visit-core.c')
| -rw-r--r-- | qapi/qapi-visit-core.c | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 7228dc2350..cd8e6031c5 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -19,8 +19,8 @@ #include "qapi/visitor.h" #include "qapi/visitor-impl.h" -void visit_start_struct(Visitor *v, void **obj, const char *kind, - const char *name, size_t size, Error **errp) +void visit_start_struct(Visitor *v, const char *name, void **obj, + const char *kind, size_t size, Error **errp) { v->start_struct(v, obj, kind, name, size, errp); } @@ -68,7 +68,7 @@ bool visit_start_union(Visitor *v, bool data_present, Error **errp) return true; } -bool visit_optional(Visitor *v, bool *present, const char *name) +bool visit_optional(Visitor *v, const char *name, bool *present) { if (v->optional) { v->optional(v, present, name); @@ -76,21 +76,22 @@ bool visit_optional(Visitor *v, bool *present, const char *name) return *present; } -void visit_get_next_type(Visitor *v, QType *type, bool promote_int, - const char *name, Error **errp) +void visit_get_next_type(Visitor *v, const char *name, QType *type, + bool promote_int, Error **errp) { if (v->get_next_type) { v->get_next_type(v, type, promote_int, name, errp); } } -void visit_type_enum(Visitor *v, int *obj, const char * const strings[], - const char *kind, const char *name, Error **errp) +void visit_type_enum(Visitor *v, const char *name, int *obj, + const char *const strings[], const char *kind, + Error **errp) { v->type_enum(v, obj, strings, kind, name, errp); } -void visit_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp) +void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp) { v->type_int64(v, obj, name, errp); } @@ -112,14 +113,15 @@ static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name, } } -void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp) +void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj, + Error **errp) { uint64_t value = *obj; visit_type_uintN(v, &value, name, UINT8_MAX, "uint8_t", errp); *obj = value; } -void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, +void visit_type_uint16(Visitor *v, const char *name, uint16_t *obj, Error **errp) { uint64_t value = *obj; @@ -127,7 +129,7 @@ void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, *obj = value; } -void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, +void visit_type_uint32(Visitor *v, const char *name, uint32_t *obj, Error **errp) { uint64_t value = *obj; @@ -135,7 +137,7 @@ void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, *obj = value; } -void visit_type_uint64(Visitor *v, uint64_t *obj, const char *name, +void visit_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp) { v->type_uint64(v, obj, name, errp); @@ -159,33 +161,37 @@ static void visit_type_intN(Visitor *v, int64_t *obj, const char *name, } } -void visit_type_int8(Visitor *v, int8_t *obj, const char *name, Error **errp) +void visit_type_int8(Visitor *v, const char *name, int8_t *obj, Error **errp) { int64_t value = *obj; visit_type_intN(v, &value, name, INT8_MIN, INT8_MAX, "int8_t", errp); *obj = value; } -void visit_type_int16(Visitor *v, int16_t *obj, const char *name, Error **errp) +void visit_type_int16(Visitor *v, const char *name, int16_t *obj, + Error **errp) { int64_t value = *obj; visit_type_intN(v, &value, name, INT16_MIN, INT16_MAX, "int16_t", errp); *obj = value; } -void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp) +void visit_type_int32(Visitor *v, const char *name, int32_t *obj, + Error **errp) { int64_t value = *obj; visit_type_intN(v, &value, name, INT32_MIN, INT32_MAX, "int32_t", errp); *obj = value; } -void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp) +void visit_type_int64(Visitor *v, const char *name, int64_t *obj, + Error **errp) { v->type_int64(v, obj, name, errp); } -void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) +void visit_type_size(Visitor *v, const char *name, uint64_t *obj, + Error **errp) { if (v->type_size) { v->type_size(v, obj, name, errp); @@ -194,23 +200,23 @@ void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) } } -void visit_type_bool(Visitor *v, bool *obj, const char *name, Error **errp) +void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp) { v->type_bool(v, obj, name, errp); } -void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp) +void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp) { v->type_str(v, obj, name, errp); } -void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp) +void visit_type_number(Visitor *v, const char *name, double *obj, + Error **errp) { v->type_number(v, obj, name, errp); } -void visit_type_any(Visitor *v, QObject **obj, const char *name, - Error **errp) +void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp) { v->type_any(v, obj, name, errp); } @@ -231,7 +237,7 @@ void output_type_enum(Visitor *v, int *obj, const char * const strings[], } enum_str = (char *)strings[value]; - visit_type_str(v, &enum_str, name, errp); + visit_type_str(v, name, &enum_str, errp); } void input_type_enum(Visitor *v, int *obj, const char * const strings[], @@ -244,7 +250,7 @@ void input_type_enum(Visitor *v, int *obj, const char * const strings[], assert(strings); - visit_type_str(v, &enum_str, name, &local_err); + visit_type_str(v, name, &enum_str, &local_err); if (local_err) { error_propagate(errp, local_err); return; |