winebuild: Avoid dead code in BuildCallFrom16Core (Coverity) (try 2)

[Frédéric Delanoy]

CID 1501

'thunk' was always 0 on line 356

try2: Moved 'output_function_size( "__wine_call_from_16_thunk" );' before the return on line 227;
merged the 2 final remaining 'if (reg_func) foo else bar'
---
 tools/winebuild/relay.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index 4fa256f..cc7dd37 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -224,6 +224,7 @@ static void BuildCallFrom16Core( int reg_func, int thunk )
         output( "\t.byte 0x66\n" );
         output( "\tlret\n" );
 
+        output_function_size( "__wine_call_from_16_thunk" );
         return;
     }
 
@@ -333,6 +334,8 @@ static void BuildCallFrom16Core( int reg_func, int thunk )
         output( "\tpopl %%ds\n" );
         output( "\tpopfl\n" );
         output( "\tlret\n" );
+
+        output_function_size( "__wine_call_from_16_regs" );
     }
     else
     {
@@ -352,10 +355,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk )
 
         /* Return to return stub which will return to caller */
         output( "\tlret $12\n" );
+
+        output_function_size( "__wine_call_from_16" );
     }
-    if (thunk) output_function_size( "__wine_call_from_16_thunk" );
-    else if (reg_func) output_function_size( "__wine_call_from_16_regs" );
-    else output_function_size( "__wine_call_from_16" );
 }
 
 
-- 
1.7.7.2