Marcus Meissner : winex11.drv: Removed dead code (Coverity).
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 6 08:03:38 CST 2007
Module: wine
Branch: master
Commit: 3afd7282bd35aa7d257fcf24c925b6f9785eace5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afd7282bd35aa7d257fcf24c925b6f9785eace5
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Mon Feb 5 21:13:55 2007 +0100
winex11.drv: Removed dead code (Coverity).
---
dlls/winex11.drv/xfont.c | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c
index 656cd40..8eebd7c 100644
--- a/dlls/winex11.drv/xfont.c
+++ b/dlls/winex11.drv/xfont.c
@@ -857,6 +857,7 @@ static BOOL LFD_ComposeLFD( const fontOb
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 fontOb
/* 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;
-
- i = fo->fi->fi_encoding & 255;
- switch( i )
- {
- default:
- aLFD.charset_encoding = boba->sufch[i].psuffix;
- break;
+ for(i = fo->fi->fi_encoding >> 8; i; i--) boba = boba->next;
+ aLFD.charset_registry = boba->prefix ? boba->prefix : any;
- case 254:
- aLFD.charset_encoding = any;
- break;
+ i = fo->fi->fi_encoding & 255;
+ switch( i ) {
+ default:
+ aLFD.charset_encoding = boba->sufch[i].psuffix;
+ 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);
More information about the wine-cvs
mailing list