Rémi Bernon : winex11: Remove unnecessary else control flow.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cc8a6b138449e300593db1be1cf0f51c54cd9579
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cc8a6b138449e300593db1be1cf0f51...

Author: Rémi Bernon 
Date:   Sun Apr  2 11:30:50 2023 +0200

winex11: Remove unnecessary else control flow.

---

dlls/winex11.drv/xim.c | 76 ++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 7a647e4a643..dda412e5eaf 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -368,53 +368,51 @@ static BOOL open_xim( Display *display )
     XGetIMValues(xim, XNQueryInputStyle, &ximStyles, NULL);
     if (ximStyles == 0)
     {
-        WARN("Could not find supported input style.\n");
-        XCloseIM(xim);
+        WARN( "Could not find supported input style.\n" );
+        XCloseIM( xim );
         return FALSE;
     }
-    else
-    {
-        TRACE("ximStyles->count_styles = %d\n", ximStyles->count_styles);

-        ximStyleRoot = 0;
-        ximStyleNone = 0;
+    TRACE("ximStyles->count_styles = %d\n", ximStyles->count_styles);

-        for (i = 0; i < ximStyles->count_styles; ++i)
+    ximStyleRoot = 0;
+    ximStyleNone = 0;
+
+    for (i = 0; i < ximStyles->count_styles; ++i)
+    {
+        int style = ximStyles->supported_styles[i];
+        TRACE("ximStyles[%d] = %s%s%s%s%s\n", i,
+                    (style&XIMPreeditArea)?"XIMPreeditArea ":"",
+                    (style&XIMPreeditCallbacks)?"XIMPreeditCallbacks ":"",
+                    (style&XIMPreeditPosition)?"XIMPreeditPosition ":"",
+                    (style&XIMPreeditNothing)?"XIMPreeditNothing ":"",
+                    (style&XIMPreeditNone)?"XIMPreeditNone ":"");
+        if (!ximStyle && (ximStyles->supported_styles[i] ==
+                            ximStyleRequest))
         {
-            int style = ximStyles->supported_styles[i];
-            TRACE("ximStyles[%d] = %s%s%s%s%s\n", i,
-                        (style&XIMPreeditArea)?"XIMPreeditArea ":"",
-                        (style&XIMPreeditCallbacks)?"XIMPreeditCallbacks ":"",
-                        (style&XIMPreeditPosition)?"XIMPreeditPosition ":"",
-                        (style&XIMPreeditNothing)?"XIMPreeditNothing ":"",
-                        (style&XIMPreeditNone)?"XIMPreeditNone ":"");
-            if (!ximStyle && (ximStyles->supported_styles[i] ==
-                                ximStyleRequest))
-            {
-                ximStyle = ximStyleRequest;
-                TRACE("Setting Style: ximStyle = ximStyleRequest\n");
-            }
-            else if (!ximStyleRoot &&(ximStyles->supported_styles[i] ==
-                     STYLE_ROOT))
-            {
-                ximStyleRoot = STYLE_ROOT;
-                TRACE("Setting Style: ximStyleRoot = STYLE_ROOT\n");
-            }
-            else if (!ximStyleNone && (ximStyles->supported_styles[i] ==
-                     STYLE_NONE))
-            {
-                TRACE("Setting Style: ximStyleNone = STYLE_NONE\n");
-                ximStyleNone = STYLE_NONE;
-            }
+            ximStyle = ximStyleRequest;
+            TRACE("Setting Style: ximStyle = ximStyleRequest\n");
+        }
+        else if (!ximStyleRoot &&(ximStyles->supported_styles[i] ==
+                 STYLE_ROOT))
+        {
+            ximStyleRoot = STYLE_ROOT;
+            TRACE("Setting Style: ximStyleRoot = STYLE_ROOT\n");
         }
-        XFree(ximStyles);
+        else if (!ximStyleNone && (ximStyles->supported_styles[i] ==
+                 STYLE_NONE))
+        {
+            TRACE("Setting Style: ximStyleNone = STYLE_NONE\n");
+            ximStyleNone = STYLE_NONE;
+        }
+    }
+    XFree(ximStyles);

-        if (ximStyle == 0)
-            ximStyle = ximStyleRoot;
+    if (ximStyle == 0)
+        ximStyle = ximStyleRoot;

-        if (ximStyle == 0)
-            ximStyle = ximStyleNone;
-    }
+    if (ximStyle == 0)
+        ximStyle = ximStyleNone;

thread_data->xim = xim;