Merge branch 'master' into working

Change-Id: Iad54233a3575c0117f88ce7a1e89bfa639760f63

7 files changed, 29 insertions, 9 deletions

diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c
index 99f8e63..48654a7 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 b6d9cb4..0bdac7f 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 5b15ff0..1473974 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 554265a..1015da7 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);
diff --git a/apps/plugins/pdbox/PDa/src/g_template.c b/apps/plugins/pdbox/PDa/src/g_template.c
index 0245158..f2770d4 100644
--- a/apps/plugins/pdbox/PDa/src/g_template.c
+++ b/apps/plugins/pdbox/PDa/src/g_template.c
@@ -630,7 +630,9 @@ static void *gtemplate_new(t_symbol *s, int argc, t_atom *argv)
     (void) s;
 #endif
     if (argc >= 1)
+    {
     	argc--; argv++;
+    }
     return (gtemplate_donew(canvas_makebindsym(sym), argc, argv));
 }
 
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index a758f73..31bab1c 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -294,7 +294,7 @@ void vid_update(int scanline)
         scanline-=16;
     else if (fb.mode==2)
         scanline-=8;
-    scanline_remapped = (scanline / 16 + 7) % 8;
+    scanline_remapped = scanline / 16;
     frameb = rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH;
     while (cnt < 160) {
         balance += LCD_WIDTH;
diff --git a/apps/plugins/test_mem.c b/apps/plugins/test_mem.c
index 7a97f51..7ff5735 100644
--- a/apps/plugins/test_mem.c
+++ b/apps/plugins/test_mem.c
@@ -210,7 +210,7 @@ enum plugin_status plugin_start(const void* parameter)
         rb->screens[0]->clear_display();
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
         TEST_MEM_PRINTF("%s", boost?"boosted":"unboosted");
-        TEST_MEM_PRINTF("clock: %d Hz", *rb->cpu_frequency);
+        TEST_MEM_PRINTF("clock: %3d.%d MHz", (*rb->cpu_frequency)/1000000, (*rb->cpu_frequency)%1000000);
 #endif
         TEST_MEM_PRINTF("loop#: %d", ++count);