From 4f7f7f286d168998d260c16d2be62e02a379aae1 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Fri, 12 Aug 2016 15:33:28 +0200
Subject: Fix misleading indentation as pointed out by the new gcc warning

Change-Id: Ia9c0b09ffb57dccbc7d13fce3b3a8a7d46b84857
---
 apps/gui/skin_engine/skin_tokens.c |  6 +++---
 apps/plugins/doom/g_game.c         |  2 ++
 apps/plugins/lua/ltablib.c         |  2 +-
 apps/plugins/lua/strncat.c         | 24 ++++++++++++++++++++----
 apps/plugins/main_menu_config.c    |  4 ++--
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 934085c707..c07d4cf2df 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -1469,8 +1469,8 @@ const char *get_token_value(struct gui_wps *gwps,
                      pitch / PITCH_SPEED_PRECISION,
              (pitch  % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
 
-        if (intval)
-            *intval = pitch_speed_enum(limit, pitch,
+            if (intval)
+                *intval = pitch_speed_enum(limit, pitch,
                            PITCH_SPEED_PRECISION * 100);
             return buf;
         }
@@ -1491,7 +1491,7 @@ const char *get_token_value(struct gui_wps *gwps,
         if (intval)
             *intval = pitch_speed_enum(limit, speed,
                            PITCH_SPEED_PRECISION * 100);
-            return buf;
+        return buf;
     }
 #endif
 
diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c
index 99f8e63187..48654a7e84 100644
--- a/apps/plugins/doom/g_game.c
+++ b/apps/plugins/doom/g_game.c
@@ -2792,9 +2792,11 @@ boolean G_CheckDemoStatus (void)
    if (demoplayback)
    {
       if (singledemo)
+      {
          I_Error("Done Playing Demo");
          return false;
 //         exit(0);  // killough
+      }
 
       if (demolumpnum != -1) {
          // cph - unlock the demo lump
diff --git a/apps/plugins/lua/ltablib.c b/apps/plugins/lua/ltablib.c
index b6d9cb4ac7..0bdac7f6c5 100644
--- a/apps/plugins/lua/ltablib.c
+++ b/apps/plugins/lua/ltablib.c
@@ -137,7 +137,7 @@ static void addfield (lua_State *L, luaL_Buffer *b, int i) {
   if (!lua_isstring(L, -1))
     luaL_error(L, "invalid value (%s) at index %d in table for "
                   LUA_QL("concat"), luaL_typename(L, -1), i);
-    luaL_addvalue(b);
+  luaL_addvalue(b);
 }
 
 
diff --git a/apps/plugins/lua/strncat.c b/apps/plugins/lua/strncat.c
index 5b15ff07b1..147397440a 100644
--- a/apps/plugins/lua/strncat.c
+++ b/apps/plugins/lua/strncat.c
@@ -8,11 +8,27 @@ char *strncat(char *s, const char *t, size_t n) {
   s+=strlen(s);
   if (__unlikely((max=s+n)==s)) goto fini;
   for (;;) {
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
 #ifndef WANT_SMALL_STRING_ROUTINES
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
 #endif
   }
   *s=0;
diff --git a/apps/plugins/main_menu_config.c b/apps/plugins/main_menu_config.c
index 554265a0bd..1015da7a40 100644
--- a/apps/plugins/main_menu_config.c
+++ b/apps/plugins/main_menu_config.c
@@ -173,12 +173,12 @@ enum plugin_status plugin_start(const void* parameter)
                     case 1:
                         if (cur_sel == 0)
                             break;
-                            swap_items(cur_sel, cur_sel - 1);
+                        swap_items(cur_sel, cur_sel - 1);
                         break;
                     case 2:
                         if (cur_sel + 1 == menu_item_count)
                             break;
-                            swap_items(cur_sel, cur_sel + 1);
+                        swap_items(cur_sel, cur_sel + 1);
                         break;
                     case 4:
                         rb->root_menu_set_default(&rb->global_settings->root_menu_customized, NULL);
-- 
cgit v1.2.3