emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move file errors into the standard formatter. Local context is preserved with

Browse source 
braces to not pollute stack for other cases.
This commit is contained in:
Jim Derry 2017-09-04 11:35:49 -04:00
parent 283f8974c3
commit be22ad3d03
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/message.c
View file

@ -238,7 +238,6 @@ typedef TidyMessageImpl*(messageFormatter)(TidyDocImpl* doc, Node *element, Node
static messageFormatter formatAttributeReport; static messageFormatter formatAttributeReport;
static messageFormatter formatBadArgument; static messageFormatter formatBadArgument;
static messageFormatter formatCustomTagDetected; static messageFormatter formatCustomTagDetected;
static messageFormatter formatFileError;
static messageFormatter formatStandard; static messageFormatter formatStandard;
static messageFormatter formatStandardDynamic; static messageFormatter formatStandardDynamic;
@ -281,9 +280,9 @@ static struct _dispatchTable {
{ ELEMENT_VERS_MISMATCH_WARN, TidyWarning, formatStandard }, { ELEMENT_VERS_MISMATCH_WARN, TidyWarning, formatStandard },
{ ENCODING_MISMATCH, TidyWarning, NULL }, { ENCODING_MISMATCH, TidyWarning, NULL },
{ ESCAPED_ILLEGAL_URI, TidyWarning, formatAttributeReport }, { ESCAPED_ILLEGAL_URI, TidyWarning, formatAttributeReport },
{ FILE_CANT_OPEN, TidyBadDocument, formatFileError }, { FILE_CANT_OPEN, TidyBadDocument, formatStandard },
{ FILE_CANT_OPEN_CFG, TidyBadDocument, formatFileError }, { FILE_CANT_OPEN_CFG, TidyBadDocument, formatStandard },
{ FILE_NOT_FILE, TidyBadDocument, formatFileError }, { FILE_NOT_FILE, TidyBadDocument, formatStandard },
{ FIXED_BACKSLASH, TidyWarning, formatAttributeReport }, { FIXED_BACKSLASH, TidyWarning, formatAttributeReport },
{ FOUND_STYLE_IN_BODY, TidyWarning, formatStandard }, { FOUND_STYLE_IN_BODY, TidyWarning, formatStandard },
{ ID_NAME_MISMATCH, TidyWarning, formatAttributeReport }, { ID_NAME_MISMATCH, TidyWarning, formatAttributeReport },
@ -493,18 +492,6 @@ TidyMessageImpl *formatCustomTagDetected(TidyDocImpl* doc, Node *element, Node *
} }
/* Provides formatting for file-related errors. */
TidyMessageImpl *formatFileError(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args)
{
ctmbstr file;
if ( (file = va_arg( args, ctmbstr)) )
return TY_(tidyMessageCreate)( doc, code, level, file );
return NULL;
}
/* Provides general formatting for the majority of Tidy's reports. Because most /* Provides general formatting for the majority of Tidy's reports. Because most
** reports use the same basic data derived from the element and node, this ** reports use the same basic data derived from the element and node, this
** formatter covers the vast majority of Tidy's report messages. Note that this ** formatter covers the vast majority of Tidy's report messages. Note that this
@ -523,6 +510,15 @@ TidyMessageImpl *formatStandard(TidyDocImpl* doc, Node *element, Node *node, uin
switch ( code ) switch ( code )
{ {
case FILE_CANT_OPEN:
case FILE_CANT_OPEN_CFG:
case FILE_NOT_FILE:
{
ctmbstr file;
if ( (file = va_arg( args, ctmbstr)) )
return TY_(tidyMessageCreate)( doc, code, level, file );
}
case SPACE_PRECEDING_XMLDECL: case SPACE_PRECEDING_XMLDECL:
/* @TODO: Should this be a TidyInfo "silent" fix? */ /* @TODO: Should this be a TidyInfo "silent" fix? */
return TY_(tidyMessageCreateWithNode)(doc, node, code, level ); return TY_(tidyMessageCreateWithNode)(doc, node, code, level );