=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winex11: Remove dead code (clang).

Alexandre Julliard julliard at winehq.org
Fri Feb 3 13:31:33 CST 2017


Module: wine
Branch: master
Commit: b1257da6585b33063a55cb0ca159d6a5c2b2418c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b1257da6585b33063a55cb0ca159d6a5c2b2418c

Author: André Hentschel <nerv at dawncrow.de>
Date:   Thu Feb  2 21:48:32 2017 +0100

winex11: Remove dead code (clang).

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winex11.drv/xim.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index e51169d..f6af293 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -334,7 +334,7 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data)
 static BOOL open_xim( Display *display )
 {
     struct x11drv_thread_data *thread_data = x11drv_thread_data();
-    XIMStyle ximStyleCallback, ximStyleNone;
+    XIMStyle ximStyleNone;
     XIMStyles *ximStyles = NULL;
     INT i;
     XIM xim;
@@ -371,7 +371,6 @@ static BOOL open_xim( Display *display )
 
         ximStyleRoot = 0;
         ximStyleNone = 0;
-        ximStyleCallback = 0;
 
         for (i = 0; i < ximStyles->count_styles; ++i)
         {
@@ -394,12 +393,6 @@ static BOOL open_xim( Display *display )
                 ximStyleRoot = STYLE_ROOT;
                 TRACE("Setting Style: ximStyleRoot = STYLE_ROOT\n");
             }
-            else if (!ximStyleCallback &&(ximStyles->supported_styles[i] ==
-                     STYLE_CALLBACK))
-            {
-                ximStyleCallback = STYLE_CALLBACK;
-                TRACE("Setting Style: ximStyleCallback = STYLE_CALLBACK\n");
-            }
             else if (!ximStyleNone && (ximStyles->supported_styles[i] ==
                      STYLE_NONE))
             {
@@ -414,13 +407,6 @@ static BOOL open_xim( Display *display )
 
         if (ximStyle == 0)
             ximStyle = ximStyleNone;
-
-        if (ximStyleCallback == 0)
-        {
-            TRACE("No callback style available\n");
-            ximStyleCallback = ximStyle;
-        }
-
     }
 
     thread_data->xim = xim;




More information about the wine-cvs mailing list