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

Merge branch 'next' of github.com:htacg/tidy-html5 into next

Browse source
This commit is contained in:
Geoff McLane 2017-04-09 02:09:19 +02:00
parent 72612b6ca3 24afc6a6fa
commit d8839485a4
2 changed files with 804 additions and 519 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1309
console/tidy.c
View file

File diff suppressed because it is too large Load diff

12
src/messageobj.c
View file

@ -384,7 +384,7 @@ TidyMessageArgument TY_(getNextMessageArgument)( TidyMessageImpl message, TidyIt
TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArgument* arg ) TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArgument* arg )
{ {
int argNum = (int)*arg; int argNum = (int)(size_t)*arg;
assert( argNum <= message.argcount ); assert( argNum <= message.argcount );
return message.arguments[argNum].type; return message.arguments[argNum].type;
@ -393,7 +393,7 @@ TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArg
ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg ) ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
{ {
int argNum = (int)*arg; int argNum = (int)(size_t)*arg;
assert( argNum <= message.argcount ); assert( argNum <= message.argcount );
return message.arguments[argNum].format; return message.arguments[argNum].format;
@ -402,7 +402,7 @@ ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* arg ) ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* arg )
{ {
int argNum = (int)*arg; int argNum = (int)(size_t)*arg;
assert( argNum <= message.argcount ); assert( argNum <= message.argcount );
assert( message.arguments[argNum].type == tidyFormatType_STRING); assert( message.arguments[argNum].type == tidyFormatType_STRING);
@ -412,7 +412,7 @@ ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* ar
uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg ) uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg )
{ {
int argNum = (int)*arg; int argNum = (int)(size_t)*arg;
assert( argNum <= message.argcount ); assert( argNum <= message.argcount );
assert( message.arguments[argNum].type == tidyFormatType_UINT); assert( message.arguments[argNum].type == tidyFormatType_UINT);
@ -422,7 +422,7 @@ uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg )
int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg ) int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg )
{ {
int argNum = (int)*arg; int argNum = (int)(size_t)*arg;
assert( argNum <= message.argcount ); assert( argNum <= message.argcount );
assert( message.arguments[argNum].type == tidyFormatType_INT); assert( message.arguments[argNum].type == tidyFormatType_INT);
@ -432,7 +432,7 @@ int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg )
double TY_(getArgValueDouble)( TidyMessageImpl message, TidyMessageArgument* arg ) double TY_(getArgValueDouble)( TidyMessageImpl message, TidyMessageArgument* arg )
{ {
int argNum = (int)*arg; int argNum = (int)(size_t)*arg;
assert( argNum <= message.argcount ); assert( argNum <= message.argcount );
assert( message.arguments[argNum].type == tidyFormatType_DOUBLE); assert( message.arguments[argNum].type == tidyFormatType_DOUBLE);