widl: Remove useless find_type_or_error2 helper.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
3cdf1fa928
commit
b3f807a142
|
@ -76,7 +76,6 @@ static warning_list_t *append_warning(warning_list_t *, int);
|
||||||
|
|
||||||
static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs);
|
static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs);
|
||||||
static type_t *find_type_or_error(const char *name, int t);
|
static type_t *find_type_or_error(const char *name, int t);
|
||||||
static type_t *find_type_or_error2(char *name, int t);
|
|
||||||
|
|
||||||
static var_t *reg_const(var_t *var);
|
static var_t *reg_const(var_t *var);
|
||||||
|
|
||||||
|
@ -1015,7 +1014,7 @@ interfacedef: interfacehdr inherit
|
||||||
| interfacehdr ':' aIDENTIFIER
|
| interfacehdr ':' aIDENTIFIER
|
||||||
'{' import int_statements '}'
|
'{' import int_statements '}'
|
||||||
semicolon_opt { $$ = $1;
|
semicolon_opt { $$ = $1;
|
||||||
type_interface_define($$, find_type_or_error2($3, 0), $6);
|
type_interface_define($$, find_type_or_error($3, 0), $6);
|
||||||
}
|
}
|
||||||
| dispinterfacedef semicolon_opt { $$ = $1; }
|
| dispinterfacedef semicolon_opt { $$ = $1; }
|
||||||
;
|
;
|
||||||
|
@ -1255,7 +1254,7 @@ acf_int_statement
|
||||||
|
|
||||||
acf_interface
|
acf_interface
|
||||||
: acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}'
|
: acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}'
|
||||||
{ type_t *iface = find_type_or_error2($3, 0);
|
{ type_t *iface = find_type_or_error($3, 0);
|
||||||
if (type_get_type(iface) != TYPE_INTERFACE)
|
if (type_get_type(iface) != TYPE_INTERFACE)
|
||||||
error_loc("%s is not an interface\n", iface->name);
|
error_loc("%s is not an interface\n", iface->name);
|
||||||
iface->attrs = append_attr_list(iface->attrs, $1);
|
iface->attrs = append_attr_list(iface->attrs, $1);
|
||||||
|
@ -2105,13 +2104,6 @@ static type_t *find_type_or_error(const char *name, int t)
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
static type_t *find_type_or_error2(char *name, int t)
|
|
||||||
{
|
|
||||||
type_t *tp = find_type_or_error(name, t);
|
|
||||||
free(name);
|
|
||||||
return tp;
|
|
||||||
}
|
|
||||||
|
|
||||||
int is_type(const char *name)
|
int is_type(const char *name)
|
||||||
{
|
{
|
||||||
return find_type(name, current_namespace, 0) != NULL ||
|
return find_type(name, current_namespace, 0) != NULL ||
|
||||||
|
|
Loading…
Reference in New Issue