From 0806f9a438f752ee88e07cad7c97c69ea9d1af2c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 14 Jun 2011 13:36:04 +0200 Subject: [PATCH] winebuild: Avoid a superflous null check (Coverity). --- tools/winebuild/res32.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0c2bd09b99..e3f46ee924 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -626,6 +626,7 @@ void output_res_o_file( DLLSPEC *spec ) unsigned int i; char *res_file = NULL; int fd; + struct strarray *args; if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); if (!output_file_name) fatal_error( "No output file name specified\n" ); @@ -681,12 +682,10 @@ void output_res_o_file( DLLSPEC *spec ) close( fd ); free( output_buffer ); - if (res_file) - { - struct strarray *args = strarray_init(); - strarray_add( args, find_tool( "windres", NULL ), "-i", res_file, "-o", output_file_name, NULL ); - spawn( args ); - strarray_free( args ); - } + args = strarray_init(); + strarray_add( args, find_tool( "windres", NULL ), "-i", res_file, "-o", output_file_name, NULL ); + spawn( args ); + strarray_free( args ); + output_file_name = NULL; /* so we don't try to assemble it */ } -- 2.32.0.93.g670b81a890