1
0
Fork 0
forked from len0rd/rockbox

Fix misleading indentation as pointed out by the new gcc warning

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

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

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;