puzzles: silence some warnings

Change-Id: Id6fd9d8dd3021f5e2cb93565d7e419aaf07f9af0
This commit is contained in:
Franklin Wei 2018-04-22 14:43:07 -04:00
parent 56803c80d0
commit ef0fb52113
42 changed files with 84 additions and 89 deletions

View file

@ -60,7 +60,7 @@ void dump_bytes(unsigned char *buf, int len)
*
* const char help_text_words[];
* const unsigned short help_text_len;
* const struct style_text help_text_style[];
* struct style_text help_text_style[];
*
* help_text_words consists of help_text_len bytes containing the
* words of the help text, delimited with NULs, not a standard C
@ -78,7 +78,7 @@ int main()
printf("#include \"lib/display_text.h\"\n\n");
printf("const struct style_text help_text_style[] = {\n");
printf("struct style_text help_text_style[] = {\n");
/* break up words on spaces and newline while printing indices of
* underlined words */

View file

@ -6,6 +6,6 @@
extern const char help_text[];
#ifdef ROCKBOX
extern const char quick_help_text[];
extern const struct style_text help_text_style[];
extern struct style_text help_text_style[];
extern const unsigned short help_text_len, quick_help_text_len, help_text_words;
#endif

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 450, TEXT_UNDERLINE },
{ 476, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 180, TEXT_CENTER | C_RED },
{ 312, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 207, TEXT_CENTER | C_RED },
{ 319, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 88, TEXT_CENTER | C_RED },
{ 151, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 83, TEXT_UNDERLINE },
{ 86, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 141, TEXT_CENTER | C_RED },
{ 306, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 76, TEXT_CENTER | C_RED },
{ 164, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 155, TEXT_CENTER | C_RED },
{ 261, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 94, TEXT_CENTER | C_RED },
{ 402, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 123, TEXT_CENTER | C_RED },
{ 404, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 39, TEXT_UNDERLINE },
{ 110, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 324, TEXT_CENTER | C_RED },
{ 391, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 169, TEXT_CENTER | C_RED },
{ 304, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 169, TEXT_CENTER | C_RED },
{ 220, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 143, TEXT_CENTER | C_RED },
{ 323, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 81, TEXT_UNDERLINE },
{ 157, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 29, TEXT_UNDERLINE },
{ 119, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 3, TEXT_UNDERLINE },
{ 120, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
LAST_STYLE_ITEM
};

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 87, TEXT_CENTER | C_RED },
{ 149, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 137, TEXT_UNDERLINE },
{ 173, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 138, TEXT_UNDERLINE },
{ 164, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 72, TEXT_CENTER | C_RED },
{ 228, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 212, TEXT_CENTER | C_RED },
{ 245, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 144, TEXT_CENTER | C_RED },
{ 311, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 116, TEXT_CENTER | C_RED },
{ 229, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 158, TEXT_CENTER | C_RED },
{ 495, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 122, TEXT_CENTER | C_RED },
{ 212, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 113, TEXT_UNDERLINE },
{ 187, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 125, TEXT_CENTER | C_RED },
{ 328, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 360, TEXT_UNDERLINE },
{ 390, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 102, TEXT_UNDERLINE },
{ 160, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 216, TEXT_CENTER | C_RED },
{ 291, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 86, TEXT_CENTER | C_RED },
{ 207, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 137, TEXT_CENTER | C_RED },
{ 297, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 202, TEXT_CENTER | C_RED },
{ 282, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 239, TEXT_CENTER | C_RED },
{ 306, TEXT_UNDERLINE },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 99, TEXT_CENTER | C_RED },
{ 221, TEXT_CENTER | C_RED },

View file

@ -1,10 +1,10 @@
/* auto-generated on Mar 17 2018 by genhelp.sh */
/* auto-generated on Apr 19 2018 by genhelp.sh */
/* help text is compressed using LZ4; see compress.c for details */
/* DO NOT EDIT! */
#include "lib/display_text.h"
const struct style_text help_text_style[] = {
struct style_text help_text_style[] = {
{ 0, TEXT_CENTER | C_RED },
{ 64, TEXT_CENTER | C_RED },
{ 100, TEXT_CENTER | C_RED },

View file

@ -1310,11 +1310,6 @@ static void rb_status_bar(void *handle, const char *text)
LOGF("game title is %s\n", text);
}
static int get_titleheight(void)
{
return rb->font_get(FONT_UI)->height;
}
static void draw_title(bool clear_first)
{
const char *base;
@ -1327,7 +1322,7 @@ static void draw_title(bool clear_first)
rb->snprintf(str, sizeof(str), "%s%s", base, zoom_enabled ? (view_mode ? " (viewing)" : " (interaction)") : "");
/* quick hack */
bool orig_clipped;
bool orig_clipped = false;
if(!zoom_enabled)
{
orig_clipped = clipped;
@ -3421,10 +3416,10 @@ enum plugin_status plugin_start(const void *param)
{
/* Solo needs a big stack */
int stack_sz = 16 * DEFAULT_STACK_SIZE;
uintptr_t old = smalloc(stack_sz);
uintptr_t old = (uintptr_t)smalloc(stack_sz);
/* word alignment */
long *stack = ((uintptr_t)old & (uintptr_t)(~0x3)) + 4;
long *stack = (long*)((char*)(((uintptr_t)old & (uintptr_t)(~0x3)) + 4));
stack_sz -= ((char*)stack - (char*)old);
thread = rb->create_thread(puzzles_main, stack, stack_sz, 0, "puzzles"