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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: be30aab1e21e5b6811470a351ec0d6100e6e7687
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=be30aab1e21e5b6811470a351...

Author: Michael Stefaniuc <mstefani(a)winehq.org>
Date:   Tue Feb 19 00:06:22 2019 +0100

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

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3dx9_36/effect.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index e8ae7b5..1abc8dc 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -948,15 +948,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
         return NULL;
     }
 
-    count = parameter ? parameter->member_count : base->parameter_count;
+    count = parameter->member_count;
 
     length = strcspn( name, "[.@" );
     part = name + length;
 
     for (i = 0; i < count; i++)
     {
-        temp_parameter = !parameter ? &base->parameters[i].param
-                : ¶meter->members[i];
+        temp_parameter = ¶meter->members[i];
 
         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);
 
                 case '@':
-                {
-                    struct d3dx_top_level_parameter *top_param
-                            = top_level_parameter_from_parameter(temp_parameter);
+                    return NULL;
 
-                    return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count,
-                            top_param->annotations, part);
-                }
                 case '[':
                     return get_parameter_element_by_name(base, temp_parameter, part);