From 60b6962db0b0488667180e11cc6cfb1cec1b41ea Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 3 Jan 2017 22:08:38 -0800 Subject: Revert "Change types for source map offsets (#174)" This reverts commit 4fbe344df43ed7f60a3d3a53981088334cb709fc. --- src/blocks.c | 48 ++---------------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) (limited to 'src/blocks.c') diff --git a/src/blocks.c b/src/blocks.c index c680535..1c1d160 100644 --- a/src/blocks.c +++ b/src/blocks.c @@ -96,8 +96,6 @@ cmark_parser *cmark_parser_new_with_mem(int options, cmark_mem *mem) { parser->refmap = cmark_reference_map_new(mem); parser->root = document; parser->current = document; - parser->error_code = CMARK_ERR_NONE; - parser->total_bytes = 0; parser->line_number = 0; parser->line_offset = 0; parser->offset = 0; @@ -552,20 +550,6 @@ static void S_parser_feed(cmark_parser *parser, const unsigned char *buffer, const unsigned char *skipped; static const uint8_t repl[] = {239, 191, 189}; - if (parser->error_code) { - return; - } - - // Limit maximum document size to BUFSIZE_MAX. This makes sure that we - // never create strbufs larger than BUFSIZE_MAX. Unfortunately, the - // public API doesn't have an error reporting mechanism, so all we can - // do is to abort. - if (len > (size_t)(BUFSIZE_MAX - parser->total_bytes)) { - parser->error_code = CMARK_ERR_INPUT_TOO_LARGE; - return; - } - parser->total_bytes += (bufsize_t)len; - if (parser->last_buffer_ended_with_cr && *buffer == '\n') { // skip NL if last buffer ended with CR ; see #117 buffer++; @@ -1282,19 +1266,14 @@ cmark_node *cmark_parser_finish(cmark_parser *parser) { cmark_strbuf_clear(&parser->linebuf); } - cmark_strbuf_clear(&parser->curline); - - if (parser->error_code) { - cmark_node_free(parser->root); - return NULL; - } - finalize_document(parser); if (parser->options & CMARK_OPT_NORMALIZE) { cmark_consolidate_text_nodes(parser->root); } + cmark_strbuf_free(&parser->curline); + #if CMARK_DEBUG_NODES if (cmark_node_check(parser->root, stderr)) { abort(); @@ -1308,26 +1287,3 @@ cmark_parser_get_first_source_extent(cmark_parser *parser) { return parser->source_map->head; } - -cmark_err_type cmark_parser_get_error(cmark_parser *parser) { - return parser->error_code; -} - -const char *cmark_parser_get_error_message(cmark_parser *parser) { - const char *str = NULL; - - switch (parser->error_code) { - case CMARK_ERR_OUT_OF_MEMORY: - str = "Out of memory"; - break; - case CMARK_ERR_INPUT_TOO_LARGE: - str = "Input too large"; - break; - default: - str = "Unknown error"; - break; - } - - return str; -} - -- cgit v1.2.3