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

Cleanup ReportNotice() a bit by introducing an HTMLVersion() function.

Browse source
This commit is contained in:
Jim Derry 2017-09-02 12:54:02 -04:00
parent 951ed381a3
commit 83263466f2
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/message.c
View file

@ -130,6 +130,19 @@ static void NtoS(int n, tmbstr str)
} }
/* Get an HTML version string */
static ctmbstr HTMLVersion( TidyDocImpl* doc )
{
uint versionEmitted = doc->lexer->versionEmitted;
uint declared = doc->lexer->doctype;
uint version = versionEmitted == 0 ? declared : versionEmitted;
ctmbstr result = TY_(HTMLVersionNameFromCode)(version, 0);
if (!result)
result = tidyLocalizedString(STRING_HTML_PROPRIETARY);
return result;
}
/********************************************************************* /*********************************************************************
* Message Writing Functions * Message Writing Functions
* These funtions provide final, formatted output to the output sink. * These funtions provide final, formatted output to the output sink.
@ -218,8 +231,6 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
Node* rpt = ( element ? element : node ); Node* rpt = ( element ? element : node );
char nodedesc[256] = { 0 }; char nodedesc[256] = { 0 };
char elemdesc[256] = { 0 }; char elemdesc[256] = { 0 };
uint versionEmitted, declared, version;
ctmbstr extra_string = NULL;
ctmbstr tagtype; ctmbstr tagtype;
TagToString(node, nodedesc, sizeof(nodedesc)); TagToString(node, nodedesc, sizeof(nodedesc));
@ -297,13 +308,7 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
break; break;
case ELEMENT_VERS_MISMATCH_WARN: case ELEMENT_VERS_MISMATCH_WARN:
versionEmitted = doc->lexer->versionEmitted; message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, HTMLVersion( doc ) );
declared = doc->lexer->doctype;
version = versionEmitted == 0 ? declared : versionEmitted;
extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
if (!extra_string)
extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string );
break; break;
@ -331,13 +336,7 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
case ELEMENT_VERS_MISMATCH_ERROR: case ELEMENT_VERS_MISMATCH_ERROR:
versionEmitted = doc->lexer->versionEmitted; message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc, HTMLVersion( doc ) );
declared = doc->lexer->doctype;
version = versionEmitted == 0 ? declared : versionEmitted;
extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
if (!extra_string)
extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc, extra_string );
break; break;
case TOO_MANY_ELEMENTS_IN: case TOO_MANY_ELEMENTS_IN: