diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2013-02-26 21:12:00 +1100 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2013-02-26 21:18:16 +1100 |
| commit | d76dca165bd3312d78df7f6794d5fbab7f634ecd (patch) | |
| tree | 294a83908804b7e61e5b9b82f407a9df65cc42a9 /apps/gui | |
| parent | 657b91acfa86430750cebb82d0ea3aaf635953bf (diff) | |
| download | rockbox-d76dca165bd3312d78df7f6794d5fbab7f634ecd.zip rockbox-d76dca165bd3312d78df7f6794d5fbab7f634ecd.tar.gz rockbox-d76dca165bd3312d78df7f6794d5fbab7f634ecd.tar.bz2 rockbox-d76dca165bd3312d78df7f6794d5fbab7f634ecd.tar.xz | |
checkwps: show a helpful error if the parser callback errors out
Change-Id: Ie3e35292ba8d74f0ff3d1bb3483a5e83aae0e6b6
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 9439664..a0386c5 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -465,7 +465,7 @@ static int parse_font_load(struct skin_element *element, if (id < 2) { DEBUGF("font id must be >= 2 (%d)\n", id); - return 1; + return -1; } #if defined(DEBUG) || defined(SIMULATOR) if (skinfonts[id-2].name != NULL) @@ -543,7 +543,7 @@ static int parse_listitem(struct skin_element *element, (void)wps_data; struct listitem *li = skin_buffer_alloc(sizeof(*li)); if (!li) - return 1; + return -1; token->value.data = PTRTOSKINOFFSET(skin_buffer, li); if (element->params_count == 0) li->offset = 0; @@ -2227,7 +2227,7 @@ static int skin_element_callback(struct skin_element* element, void* data) } if (function) { - if (function(element, token, wps_data) < 0) + if (function(element, token, wps_data) != 0) return CALLBACK_ERROR; } /* tags that start with 'F', 'I' or 'D' are for the next file */ |