len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix misleading indentation as pointed out by the new gcc warning

Browse source 
Change-Id: Ia9c0b09ffb57dccbc7d13fce3b3a8a7d46b84857
This commit is contained in:
Frank Gevaerts 2016-08-12 15:33:28 +02:00
parent 37cc433628
commit 4f7f7f286d
5 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/gui/skin_engine/skin_tokens.c
View file

@ -1469,8 +1469,8 @@ const char *get_token_value(struct gui_wps *gwps,
pitch / PITCH_SPEED_PRECISION, pitch / PITCH_SPEED_PRECISION,
(pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
if (intval) if (intval)
*intval = pitch_speed_enum(limit, pitch, *intval = pitch_speed_enum(limit, pitch,
PITCH_SPEED_PRECISION * 100); PITCH_SPEED_PRECISION * 100);
return buf; return buf;
} }
@ -1491,7 +1491,7 @@ const char *get_token_value(struct gui_wps *gwps,
if (intval) if (intval)
*intval = pitch_speed_enum(limit, speed, *intval = pitch_speed_enum(limit, speed,
PITCH_SPEED_PRECISION * 100); PITCH_SPEED_PRECISION * 100);
return buf; return buf;
} }
#endif #endif

2
apps/plugins/doom/g_game.c
View file

@ -2792,9 +2792,11 @@ boolean G_CheckDemoStatus (void)
if (demoplayback) if (demoplayback)
{ {
if (singledemo) if (singledemo)
{
I_Error("Done Playing Demo"); I_Error("Done Playing Demo");
return false; return false;
// exit(0); // killough // exit(0); // killough
}
if (demolumpnum != -1) { if (demolumpnum != -1) {
// cph - unlock the demo lump // cph - unlock the demo lump

2
apps/plugins/lua/ltablib.c
View file

@ -137,7 +137,7 @@ static void addfield (lua_State *L, luaL_Buffer *b, int i) {
if (!lua_isstring(L, -1)) if (!lua_isstring(L, -1))
luaL_error(L, "invalid value (%s) at index %d in table for " luaL_error(L, "invalid value (%s) at index %d in table for "
LUA_QL("concat"), luaL_typename(L, -1), i); LUA_QL("concat"), luaL_typename(L, -1), i);
luaL_addvalue(b); luaL_addvalue(b);
} }

24
apps/plugins/lua/strncat.c
View file

@ -8,11 +8,27 @@ char *strncat(char *s, const char *t, size_t n) {
s+=strlen(s); s+=strlen(s);
if (__unlikely((max=s+n)==s)) goto fini; if (__unlikely((max=s+n)==s)) goto fini;
for (;;) { 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 #ifndef WANT_SMALL_STRING_ROUTINES
if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; if (__unlikely(!(*s = *t)))
if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; break;
if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; 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 #endif
} }
*s=0; *s=0;

4
apps/plugins/main_menu_config.c
View file

@ -173,12 +173,12 @@ enum plugin_status plugin_start(const void* parameter)
case 1: case 1:
if (cur_sel == 0) if (cur_sel == 0)
break; break;
swap_items(cur_sel, cur_sel - 1); swap_items(cur_sel, cur_sel - 1);
break; break;
case 2: case 2:
if (cur_sel + 1 == menu_item_count) if (cur_sel + 1 == menu_item_count)
break; break;
swap_items(cur_sel, cur_sel + 1); swap_items(cur_sel, cur_sel + 1);
break; break;
case 4: case 4:
rb->root_menu_set_default(&rb->global_settings->root_menu_customized, NULL); rb->root_menu_set_default(&rb->global_settings->root_menu_customized, NULL);