summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2016-08-12 15:33:28 +0200
committerFrank Gevaerts <frank@gevaerts.be>2016-08-12 15:33:28 +0200
commit4f7f7f286d168998d260c16d2be62e02a379aae1 (patch)
tree1d25c028e17618daeaad509af15377203e1c00c6
parent37cc4336286bd5ba8fd7611e91dd197469a2e9d2 (diff)
downloadrockbox-4f7f7f286d168998d260c16d2be62e02a379aae1.tar.gz
rockbox-4f7f7f286d168998d260c16d2be62e02a379aae1.zip
Fix misleading indentation as pointed out by the new gcc warning
Change-Id: Ia9c0b09ffb57dccbc7d13fce3b3a8a7d46b84857
-rw-r--r--apps/gui/skin_engine/skin_tokens.c6
-rw-r--r--apps/plugins/doom/g_game.c2
-rw-r--r--apps/plugins/lua/ltablib.c2
-rw-r--r--apps/plugins/lua/strncat.c24
-rw-r--r--apps/plugins/main_menu_config.c4
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,
1469 pitch / PITCH_SPEED_PRECISION, 1469 pitch / PITCH_SPEED_PRECISION,
1470 (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); 1470 (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
1471 1471
1472 if (intval) 1472 if (intval)
1473 *intval = pitch_speed_enum(limit, pitch, 1473 *intval = pitch_speed_enum(limit, pitch,
1474 PITCH_SPEED_PRECISION * 100); 1474 PITCH_SPEED_PRECISION * 100);
1475 return buf; 1475 return buf;
1476 } 1476 }
@@ -1491,7 +1491,7 @@ const char *get_token_value(struct gui_wps *gwps,
1491 if (intval) 1491 if (intval)
1492 *intval = pitch_speed_enum(limit, speed, 1492 *intval = pitch_speed_enum(limit, speed,
1493 PITCH_SPEED_PRECISION * 100); 1493 PITCH_SPEED_PRECISION * 100);
1494 return buf; 1494 return buf;
1495 } 1495 }
1496#endif 1496#endif
1497 1497
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)
2792 if (demoplayback) 2792 if (demoplayback)
2793 { 2793 {
2794 if (singledemo) 2794 if (singledemo)
2795 {
2795 I_Error("Done Playing Demo"); 2796 I_Error("Done Playing Demo");
2796 return false; 2797 return false;
2797// exit(0); // killough 2798// exit(0); // killough
2799 }
2798 2800
2799 if (demolumpnum != -1) { 2801 if (demolumpnum != -1) {
2800 // cph - unlock the demo lump 2802 // 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) {
137 if (!lua_isstring(L, -1)) 137 if (!lua_isstring(L, -1))
138 luaL_error(L, "invalid value (%s) at index %d in table for " 138 luaL_error(L, "invalid value (%s) at index %d in table for "
139 LUA_QL("concat"), luaL_typename(L, -1), i); 139 LUA_QL("concat"), luaL_typename(L, -1), i);
140 luaL_addvalue(b); 140 luaL_addvalue(b);
141} 141}
142 142
143 143
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) {
8 s+=strlen(s); 8 s+=strlen(s);
9 if (__unlikely((max=s+n)==s)) goto fini; 9 if (__unlikely((max=s+n)==s)) goto fini;
10 for (;;) { 10 for (;;) {
11 if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; 11 if (__unlikely(!(*s = *t)))
12 break;
13 if (__unlikely(++s==max))
14 break;
15 ++t;
12#ifndef WANT_SMALL_STRING_ROUTINES 16#ifndef WANT_SMALL_STRING_ROUTINES
13 if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; 17 if (__unlikely(!(*s = *t)))
14 if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; 18 break;
15 if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; 19 if (__unlikely(++s==max))
20 break;
21 ++t;
22 if (__unlikely(!(*s = *t)))
23 break;
24 if (__unlikely(++s==max))
25 break;
26 ++t;
27 if (__unlikely(!(*s = *t)))
28 break;
29 if (__unlikely(++s==max))
30 break;
31 ++t;
16#endif 32#endif
17 } 33 }
18 *s=0; 34 *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)
173 case 1: 173 case 1:
174 if (cur_sel == 0) 174 if (cur_sel == 0)
175 break; 175 break;
176 swap_items(cur_sel, cur_sel - 1); 176 swap_items(cur_sel, cur_sel - 1);
177 break; 177 break;
178 case 2: 178 case 2:
179 if (cur_sel + 1 == menu_item_count) 179 if (cur_sel + 1 == menu_item_count)
180 break; 180 break;
181 swap_items(cur_sel, cur_sel + 1); 181 swap_items(cur_sel, cur_sel + 1);
182 break; 182 break;
183 case 4: 183 case 4:
184 rb->root_menu_set_default(&rb->global_settings->root_menu_customized, NULL); 184 rb->root_menu_set_default(&rb->global_settings->root_menu_customized, NULL);