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

Merge branch 'next' into issue-456

Browse source 
Continue WIP #456
This commit is contained in:
Geoff McLane 2017-06-04 14:58:28 +02:00
parent 722a841ce2 e48b06b8c0
commit e28ec72301
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
console/tidy.c
View file

@ -39,6 +39,9 @@ static FILE* errout = NULL;
#if defined(_WIN32) #if defined(_WIN32)
/** On Windows, we will store the original code page here. */ /** On Windows, we will store the original code page here. */
static uint win_cp; /* original Windows code page */ static uint win_cp; /* original Windows code page */
#if (defined(_MSC_VER) && (_MSC_VER < 1900))
#define snprintf _snprintf
#endif
#endif #endif
@ -1529,8 +1532,8 @@ static void printXMLCrossRefEqConsole(TidyDoc tdoc, /**< The Tidy document. */
if ( hit ) if ( hit )
{ {
localHit = *hit;
tmbstr localName; tmbstr localName;
localHit = *hit;
localize_option_names( &localHit ); localize_option_names( &localHit );
printf(" <eqconsole>%s</eqconsole>\n", localName = get_escaped_name(localHit.name1)); printf(" <eqconsole>%s</eqconsole>\n", localName = get_escaped_name(localHit.name1));
free((tmbstr)localHit.name1); free((tmbstr)localHit.name1);
@ -1882,12 +1885,12 @@ int main( int argc, char** argv )
TidyDoc tdoc = tidyCreate(); TidyDoc tdoc = tidyCreate();
int status = 0; int status = 0;
tmbstr locale = NULL; tmbstr locale = NULL;
tidySetMessageCallback( tdoc, reportCallback); /* experimental group */
uint contentErrors = 0; uint contentErrors = 0;
uint contentWarnings = 0; uint contentWarnings = 0;
uint accessWarnings = 0; uint accessWarnings = 0;
tidySetMessageCallback( tdoc, reportCallback); /* experimental group */
errout = stderr; /* initialize to stderr */ errout = stderr; /* initialize to stderr */
/* Set an atexit handler. */ /* Set an atexit handler. */

4
src/message.c
View file

@ -569,9 +569,9 @@ void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
/* lexer is not defined when this is called */ /* lexer is not defined when this is called */
void TY_(ReportBadArgument)( TidyDocImpl* doc, ctmbstr option ) void TY_(ReportBadArgument)( TidyDocImpl* doc, ctmbstr option )
{ {
TidyMessageImpl *message;
assert( option != NULL ); assert( option != NULL );
message = TY_(tidyMessageCreate)( doc, STRING_MISSING_MALFORMED, TidyConfig, option );
TidyMessageImpl *message = TY_(tidyMessageCreate)( doc, STRING_MISSING_MALFORMED, TidyConfig, option );
messageOut( message ); messageOut( message );
} }

4
version.txt
View file

@ -1,2 +1,2 @@
5.5.30 5.5.31
2017.05.29 2017.05.30