diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fbc9f3cc5bd..c62ba96e7a6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3577,9 +3577,8 @@ static unsigned int write_range_tfs(FILE *file, const attr_list_t *attrs, return start_offset; } -static unsigned int write_type_tfs(FILE *file, int indent, - const attr_list_t *attrs, type_t *type, - const char *name, +static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, + type_t *type, const char *name, enum type_context context, unsigned int *typeformat_offset) { @@ -3660,13 +3659,13 @@ static unsigned int write_type_tfs(FILE *file, int indent, if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset); - offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset); + offset = write_type_tfs(file, attrs, ref, name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; return offset; } - offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name, + offset = write_type_tfs( file, attrs, type_pointer_get_ref(type), name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; @@ -3682,7 +3681,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, int write_ptr, unsigned int *tfsoff) { - return write_type_tfs(file, 2, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); + return write_type_tfs(file, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); } static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset) @@ -3709,12 +3708,12 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in var = type_function_get_retval(func->type); if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, func->name, + var->typestring_offset = write_type_tfs( file, var->attrs, var->type, func->name, TYPE_CONTEXT_RETVAL, offset); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + var->typestring_offset = write_type_tfs( file, var->attrs, var->type, var->name, TYPE_CONTEXT_TOPLEVELPARAM, offset ); break; @@ -3726,7 +3725,7 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in { if (is_attr(type_entry->type->attrs, ATTR_ENCODE) || is_attr(type_entry->type->attrs, ATTR_DECODE)) - type_entry->type->typestring_offset = write_type_tfs( file, 2, + type_entry->type->typestring_offset = write_type_tfs( file, type_entry->type->attrs, type_entry->type, type_entry->type->name, TYPE_CONTEXT_CONTAINER, offset); }