Merge branch 'next' into issue-456

Continue WIP #456

Author: geoffmcl

console/tidy.c

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

src/message.c

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

version.txt

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