X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_arg.c;h=774d3029565f2548e03c7d30a1c434fc51b690eb;hb=7e27dcea4ad3aa1f49ef56202fdd2c3577049160;hp=f9ed34766965ac8109b0618947bab22f25632bbc;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c index f9ed347..774d302 100644 --- a/src/types/decl_arg.c +++ b/src/types/decl_arg.c @@ -139,7 +139,8 @@ bool psi_decl_arg_validate_typedef(struct psi_data *data, def->type->type = PSI_T_POINTER; } else { data->error(data, def->token, PSI_WARNING, - "Type '%s' cannot be aliased to 'void'", def->type->name->val); + "Type '%s' cannot be aliased to 'void'", + def->type->name->val); return false; } } else if (!psi_decl_type_validate(data, def->type, def, scope)) { @@ -160,8 +161,10 @@ bool psi_decl_arg_validate_typedef(struct psi_data *data, break; } data->error(data, def->token, PSI_WARNING, - "Type '%s' cannot be aliased to '%s%s'%s%s", def->var->name, pre, - def->type->name->val, *data->last_error ? ": " : "", data->last_error); + "Type '%s' cannot be aliased to '%s%s'%s%s", + def->var->name->val, pre, + def->type->name->val, + *data->last_error ? ": " : "", data->last_error); return false; } @@ -264,7 +267,7 @@ struct psi_decl_arg *psi_decl_arg_get_by_var(struct psi_decl_var *var, return var->arg = arg; } - if (func && !zend_string_equals(var->name, func->var->name)) { + if (func && zend_string_equals(var->name, func->var->name)) { return var->arg = func; }