From 460199488fd9f914a8555399dea3332ce194f664 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 2 Oct 2015 12:26:46 -0500 Subject: [PATCH] Fix a couple sign compare issues. --- mwparserfromhell/parser/ctokenizer/tok_parse.c | 7 ++++--- mwparserfromhell/parser/ctokenizer/tok_parse.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mwparserfromhell/parser/ctokenizer/tok_parse.c b/mwparserfromhell/parser/ctokenizer/tok_parse.c index 4bb65b4..5833d01 100644 --- a/mwparserfromhell/parser/ctokenizer/tok_parse.c +++ b/mwparserfromhell/parser/ctokenizer/tok_parse.c @@ -30,6 +30,7 @@ SOFTWARE. #define DIGITS "0123456789" #define HEXDIGITS "0123456789abcdefABCDEF" #define ALPHANUM "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +#define URISCHEME "abcdefghijklmnopqrstuvwxyz0123456789+.-" #define MAX_BRACES 255 #define MAX_ENTITY_SIZE 8 @@ -438,7 +439,7 @@ static PyObject* Tokenizer_handle_wikilink_end(Tokenizer* self) */ static int Tokenizer_parse_bracketed_uri_scheme(Tokenizer* self) { - static const char* valid = "abcdefghijklmnopqrstuvwxyz0123456789+.-"; + static const char* valid = URISCHEME; Textbuffer* buffer; PyObject* scheme; Unicode this; @@ -510,7 +511,7 @@ static int Tokenizer_parse_bracketed_uri_scheme(Tokenizer* self) */ static int Tokenizer_parse_free_uri_scheme(Tokenizer* self) { - static const char* valid = "abcdefghijklmnopqrstuvwxyz0123456789+.-"; + static const char* valid = URISCHEME; Textbuffer *scheme_buffer = Textbuffer_new(&self->text); PyObject *scheme; Unicode chunk; @@ -2129,7 +2130,7 @@ Tokenizer_emit_table_tag(Tokenizer* self, const char* open_open_markup, /* Handle style attributes for a table until an ending token. */ -static PyObject* Tokenizer_handle_table_style(Tokenizer* self, char end_token) +static PyObject* Tokenizer_handle_table_style(Tokenizer* self, Unicode end_token) { TagData *data = TagData_new(&self->text); PyObject *padding, *trash; diff --git a/mwparserfromhell/parser/ctokenizer/tok_parse.h b/mwparserfromhell/parser/ctokenizer/tok_parse.h index 0899a34..b627ca7 100644 --- a/mwparserfromhell/parser/ctokenizer/tok_parse.h +++ b/mwparserfromhell/parser/ctokenizer/tok_parse.h @@ -24,7 +24,7 @@ SOFTWARE. #include "common.h" -static const char MARKERS[] = { +static const Unicode MARKERS[] = { '{', '}', '[', ']', '<', '>', '|', '=', '&', '\'', '#', '*', ';', ':', '/', '-', '!', '\n', '\0'};