From 951ed381a3ef99fadce01785e79af587e6267761 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Thu, 31 Aug 2017 13:45:01 -0400 Subject: [PATCH] Restore message logic. No bump. --- src/message.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/message.c b/src/message.c index 25f15ce..db2d974 100755 --- a/src/message.c +++ b/src/message.c @@ -55,7 +55,6 @@ static Bool UpdateCount( TidyDocImpl* doc, TidyReportLevel level ) break; case TidyWarning: doc->warnings++; - go = go && cfgBool( doc, TidyShowWarnings ); break; case TidyConfig: doc->optionErrors++; @@ -215,7 +214,7 @@ static void messageOut( TidyMessageImpl *message ) void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code) { TidyMessageImpl *message = NULL; - TidyMessageImpl *message2 = NULL; /* extra, when TidyShowWarnings */ + TidyMessageImpl *message2 = NULL; Node* rpt = ( element ? element : node ); char nodedesc[256] = { 0 }; char elemdesc[256] = { 0 }; @@ -307,6 +306,7 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code) message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string ); break; + case CUSTOM_TAG_DETECTED: TagToString(element, elemdesc, sizeof(elemdesc)); @@ -329,6 +329,7 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code) message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype ); break; + case ELEMENT_VERS_MISMATCH_ERROR: versionEmitted = doc->lexer->versionEmitted; declared = doc->lexer->doctype; @@ -381,7 +382,10 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code) } messageOut( message ); - messageOut( message2 ); + + /* is TidyInfo, but only show it if we're showing warnings! */ + if ( cfgBool(doc, TidyShowWarnings) == yes ) + messageOut( message2 ); }