diff options
author | Franklin Wei <franklin@rockbox.org> | 2020-06-25 16:33:19 -0400 |
---|---|---|
committer | Franklin Wei <franklin@rockbox.org> | 2020-06-25 16:46:03 -0400 |
commit | d75131569cb74faa2a75eb94b1a81e8c0fe7bb7f (patch) | |
tree | d75ae898a5182da6996de3cbcd2dcd1318f3fd66 /apps | |
parent | b67d9e9217351c903a9d1ac571db698e362f3d18 (diff) | |
download | rockbox-d75131569cb74faa2a75eb94b1a81e8c0fe7bb7f.tar.gz rockbox-d75131569cb74faa2a75eb94b1a81e8c0fe7bb7f.zip |
puzzles: clean up error messages
Expands buffer size, and prints to LOGF.
Change-Id: I6dbcf60152d69c928270023c550976b802269d95
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/puzzles/rbassert.h | 2 | ||||
-rw-r--r-- | apps/plugins/puzzles/rockbox.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/plugins/puzzles/rbassert.h b/apps/plugins/puzzles/rbassert.h index f3fef84351..56142d633b 100644 --- a/apps/plugins/puzzles/rbassert.h +++ b/apps/plugins/puzzles/rbassert.h | |||
@@ -8,6 +8,6 @@ | |||
8 | #define assert(p) ((void)0) | 8 | #define assert(p) ((void)0) |
9 | #else | 9 | #else |
10 | 10 | ||
11 | #define assert(e) ((e) ? (void)0 : fatal("assertion failed %s:%d", __FILE__, __LINE__)) | 11 | #define assert(e) ((e) ? (void)0 : fatal("assertion failed on %s line %d: " #e, __FILE__, __LINE__)) |
12 | 12 | ||
13 | #endif /* NDEBUG */ | 13 | #endif /* NDEBUG */ |
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c index ac6388bf4d..1aee42d080 100644 --- a/apps/plugins/puzzles/rockbox.c +++ b/apps/plugins/puzzles/rockbox.c | |||
@@ -1448,15 +1448,17 @@ const drawing_api rb_drawing = { | |||
1448 | void fatal(const char *fmt, ...) | 1448 | void fatal(const char *fmt, ...) |
1449 | { | 1449 | { |
1450 | va_list ap; | 1450 | va_list ap; |
1451 | char buf[256]; | ||
1451 | 1452 | ||
1452 | rb->splash(HZ, "FATAL"); | 1453 | rb->splash(HZ, "FATAL"); |
1453 | 1454 | ||
1454 | va_start(ap, fmt); | 1455 | va_start(ap, fmt); |
1455 | char buf[80]; | 1456 | rb->vsnprintf(buf, sizeof(buf), fmt, ap); |
1456 | rb->vsnprintf(buf, 80, fmt, ap); | ||
1457 | rb->splash(HZ * 2, buf); | ||
1458 | va_end(ap); | 1457 | va_end(ap); |
1459 | 1458 | ||
1459 | LOGF("%s", buf); | ||
1460 | rb->splash(HZ * 2, buf); | ||
1461 | |||
1460 | if(rb->thread_self() == thread) | 1462 | if(rb->thread_self() == thread) |
1461 | rb->thread_exit(); | 1463 | rb->thread_exit(); |
1462 | else | 1464 | else |