len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-14 07:32:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkwps: show a helpful error if the parser callback errors out

Browse source 
Change-Id: Ie3e35292ba8d74f0ff3d1bb3483a5e83aae0e6b6
This commit is contained in:
Jonathan Gordon 2013-02-26 21:12:00 +11:00
parent 657b91acfa
commit d76dca165b
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/gui/skin_engine/skin_parser.c
View file

@ -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 */