From d76dca165bd3312d78df7f6794d5fbab7f634ecd Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 26 Feb 2013 21:12:00 +1100 Subject: checkwps: show a helpful error if the parser callback errors out Change-Id: Ie3e35292ba8d74f0ff3d1bb3483a5e83aae0e6b6 --- apps/gui/skin_engine/skin_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') 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 */ -- cgit v1.1