Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more error handling for checkwps

Browse source 
Change-Id: I03055d045c0a8e0e63e17b290cc71c54a8dc3634
This commit is contained in:
Jonathan Gordon 2013-02-27 21:15:57 +11:00
parent d76dca165b
commit 2febee5265
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/skin_parser/skin_parser.c
View file

@ -152,8 +152,11 @@ static struct skin_element* skin_parse_viewport(const char** document)
else if (callback)
{
if (callback(retval, callback_data) == CALLBACK_ERROR)
{
skin_error(GOT_CALLBACK_ERROR, cursor);
return NULL;
}
}
#endif
if (check_viewport(cursor))
@ -329,6 +332,7 @@ static struct skin_element* skin_parse_line_optional(const char** document,
switch (callback(retval, callback_data))
{
case CALLBACK_ERROR:
skin_error(GOT_CALLBACK_ERROR, cursor);
return NULL;
default:
break;
@ -475,8 +479,11 @@ static struct skin_element* skin_parse_sublines_optional(const char** document,
if (callback)
{
if (callback(retval, callback_data) == CALLBACK_ERROR)
{
skin_error(GOT_CALLBACK_ERROR, *document);
return NULL;
}
}
#endif
*document = cursor;
retval->children = skin_buffer_to_offset(children);
@ -896,8 +903,11 @@ static int skin_parse_text(struct skin_element* element, const char** document,
if (callback)
{
if (callback(element, callback_data) == CALLBACK_ERROR)
{
skin_error(GOT_CALLBACK_ERROR, *document);
return 0;
}
}
#endif
*document = cursor;