From 3afd7282bd35aa7d257fcf24c925b6f9785eace5 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Mon, 5 Feb 2007 21:13:55 +0100
Subject: [PATCH] winex11.drv: Removed dead code (Coverity).

---
 dlls/winex11.drv/xfont.c | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c
index 656cd404a19..8eebd7cae13 100644
--- a/dlls/winex11.drv/xfont.c
+++ b/dlls/winex11.drv/xfont.c
@@ -857,6 +857,7 @@ static BOOL LFD_ComposeLFD( const fontObject* fo,
    const char   *any = "*";
    char         h_string[64], resx_string[64], resy_string[64];
    LFD          aLFD;
+   const fontEncodingTemplate* boba = &fETTable[0];
 
 /* Get the worst case over with first */
 
@@ -1001,33 +1002,22 @@ static BOOL LFD_ComposeLFD( const fontObject* fo,
 
 /* encoding */
 
-   if (uRelax <= 5)
-   {
-       const fontEncodingTemplate* boba = &fETTable[0];
+   for(i = fo->fi->fi_encoding >> 8; i; i--) boba = boba->next;
+   aLFD.charset_registry = boba->prefix ? boba->prefix : any;
 
-       for(i = fo->fi->fi_encoding >> 8; i; i--) boba = boba->next;
-       aLFD.charset_registry = boba->prefix ? boba->prefix : any;
+   i = fo->fi->fi_encoding & 255;
+   switch( i ) {
+   default:
+       aLFD.charset_encoding = boba->sufch[i].psuffix;
+       break;
 
-       i = fo->fi->fi_encoding & 255;
-       switch( i )
-       {
-       default:
-	   aLFD.charset_encoding = boba->sufch[i].psuffix;
-	   break;
-
-       case 254:
-	   aLFD.charset_encoding = any;
-	   break;
-
-       case 255: /* no suffix - it ends eg "-ascii" */
-	   aLFD.charset_encoding = NULL;
-	   break;
-       }
-   }
-   else
-   {
-       aLFD.charset_registry = any;
+   case 254:
        aLFD.charset_encoding = any;
+       break;
+
+   case 255: /* no suffix - it ends eg "-ascii" */
+       aLFD.charset_encoding = NULL;
+       break;
    }
 
    LFD_UnParse(lpLFD, MAX_LFD_LENGTH, &aLFD);