Commit 043fd669 authored by Alexandre Julliard's avatar Alexandre Julliard

widl: Use unsigned int instead of size_t to avoid printf format warnings.

parent c425045a
...@@ -154,13 +154,15 @@ static void assign_out_args(const func_t *func) ...@@ -154,13 +154,15 @@ static void assign_out_args(const func_t *func)
if (has_size) if (has_size)
{ {
unsigned int size;
type_t *type = var->type; type_t *type = var->type;
while (type->type == 0 && type->ref) while (type->type == 0 && type->ref)
type = type->ref; type = type->ref;
fprintf(server, " = NdrAllocate(&_StubMsg, "); fprintf(server, " = NdrAllocate(&_StubMsg, ");
write_expr(server, size_is, 1); write_expr(server, size_is, 1);
fprintf(server, " * %u);\n", get_type_memsize(type)); size = get_type_memsize(type);
fprintf(server, " * %u);\n", size);
} }
else if (!is_string) else if (!is_string)
{ {
......
...@@ -596,7 +596,7 @@ size_t get_type_memsize(const type_t *type) ...@@ -596,7 +596,7 @@ size_t get_type_memsize(const type_t *type)
static int write_pointers(FILE *file, const attr_t *attrs, static int write_pointers(FILE *file, const attr_t *attrs,
const type_t *type, int ptr_level, const type_t *type, int ptr_level,
const expr_t *array, int level, const expr_t *array, int level,
size_t *typestring_offset) unsigned int *typestring_offset)
{ {
int pointers_written = 0; int pointers_written = 0;
const var_t *v; const var_t *v;
...@@ -702,7 +702,7 @@ static size_t write_pointer_description(FILE *file, const attr_t *attrs, ...@@ -702,7 +702,7 @@ static size_t write_pointer_description(FILE *file, const attr_t *attrs,
static size_t write_string_tfs(FILE *file, const attr_t *attrs, static size_t write_string_tfs(FILE *file, const attr_t *attrs,
const type_t *type, const expr_t *array, const type_t *type, const expr_t *array,
const char *name, size_t *typestring_offset) const char *name, unsigned int *typestring_offset)
{ {
const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS);
int has_size = size_is && (size_is->type != EXPR_VOID); int has_size = size_is && (size_is->type != EXPR_VOID);
...@@ -782,7 +782,7 @@ static size_t write_string_tfs(FILE *file, const attr_t *attrs, ...@@ -782,7 +782,7 @@ static size_t write_string_tfs(FILE *file, const attr_t *attrs,
static size_t write_array_tfs(FILE *file, const attr_t *attrs, static size_t write_array_tfs(FILE *file, const attr_t *attrs,
const type_t *type, const expr_t *array, const type_t *type, const expr_t *array,
const char *name, size_t *typestring_offset) const char *name, unsigned int *typestring_offset)
{ {
const expr_t *length_is = get_attrp(attrs, ATTR_LENGTHIS); const expr_t *length_is = get_attrp(attrs, ATTR_LENGTHIS);
const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS);
...@@ -1050,9 +1050,9 @@ static size_t write_struct_members(FILE *file, const type_t *type) ...@@ -1050,9 +1050,9 @@ static size_t write_struct_members(FILE *file, const type_t *type)
} }
static size_t write_struct_tfs(FILE *file, const type_t *type, static size_t write_struct_tfs(FILE *file, const type_t *type,
const char *name, size_t *typestring_offset) const char *name, unsigned int *typestring_offset)
{ {
size_t total_size; unsigned int total_size;
const var_t *array; const var_t *array;
size_t start_offset; size_t start_offset;
size_t array_offset; size_t array_offset;
...@@ -1210,7 +1210,7 @@ static size_t write_struct_tfs(FILE *file, const type_t *type, ...@@ -1210,7 +1210,7 @@ static size_t write_struct_tfs(FILE *file, const type_t *type,
} }
} }
static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, size_t *typeformat_offset) static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, unsigned int *typeformat_offset)
{ {
int in_attr, out_attr; int in_attr, out_attr;
unsigned char flags = 0; unsigned char flags = 0;
...@@ -1234,14 +1234,14 @@ static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offse ...@@ -1234,14 +1234,14 @@ static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offse
static size_t write_union_tfs(FILE *file, const attr_t *attrs, static size_t write_union_tfs(FILE *file, const attr_t *attrs,
const type_t *type, const char *name, const type_t *type, const char *name,
size_t *typeformat_offset) unsigned int *typeformat_offset)
{ {
error("write_union_tfs: Unimplemented\n"); error("write_union_tfs: Unimplemented\n");
return *typeformat_offset; return *typeformat_offset;
} }
static size_t write_typeformatstring_var(FILE *file, int indent, static size_t write_typeformatstring_var(FILE *file, int indent,
const var_t *var, size_t *typeformat_offset) const var_t *var, unsigned int *typeformat_offset)
{ {
const type_t *type = var->type; const type_t *type = var->type;
int ptr_level = var->ptr_level; int ptr_level = var->ptr_level;
...@@ -1350,7 +1350,7 @@ void write_typeformatstring(FILE *file, const ifref_t *ifaces) ...@@ -1350,7 +1350,7 @@ void write_typeformatstring(FILE *file, const ifref_t *ifaces)
{ {
int indent = 0; int indent = 0;
var_t *var; var_t *var;
size_t typeformat_offset; unsigned int typeformat_offset;
const ifref_t *iface = ifaces; const ifref_t *iface = ifaces;
print_file(file, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_file(file, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n");
...@@ -1855,7 +1855,7 @@ size_t get_size_procformatstring_var(const var_t *var) ...@@ -1855,7 +1855,7 @@ size_t get_size_procformatstring_var(const var_t *var)
size_t get_size_typeformatstring_var(const var_t *var) size_t get_size_typeformatstring_var(const var_t *var)
{ {
size_t type_offset = 0; unsigned int type_offset = 0;
write_typeformatstring_var(NULL, 0, var, &type_offset); write_typeformatstring_var(NULL, 0, var, &type_offset);
return type_offset; return type_offset;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment