d3dx9: Remove redundant "not NULL" checks (coccinellery).

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2019-02-19 00:06:22 +01:00 committed by Alexandre Julliard
parent cfe8651c91
commit be30aab1e2
1 changed files with 3 additions and 9 deletions

View File

@ -948,15 +948,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return NULL; return NULL;
} }
count = parameter ? parameter->member_count : base->parameter_count; count = parameter->member_count;
length = strcspn( name, "[.@" ); length = strcspn( name, "[.@" );
part = name + length; part = name + length;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
temp_parameter = !parameter ? &base->parameters[i].param temp_parameter = &parameter->members[i];
: &parameter->members[i];
if (!strcmp(temp_parameter->name, name)) if (!strcmp(temp_parameter->name, name))
{ {
@ -971,13 +970,8 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return get_parameter_by_name(base, temp_parameter, part); return get_parameter_by_name(base, temp_parameter, part);
case '@': case '@':
{ return NULL;
struct d3dx_top_level_parameter *top_param
= top_level_parameter_from_parameter(temp_parameter);
return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count,
top_param->annotations, part);
}
case '[': case '[':
return get_parameter_element_by_name(base, temp_parameter, part); return get_parameter_element_by_name(base, temp_parameter, part);