From 4ec14565a73ba8a34e7ed203d15b897b813d5117 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 28 Nov 2014 03:14:18 +0000 Subject: Simplify the code by making various mdoc parser helper functions void. No functional change, minus 130 lines of code. --- mdoc.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) (limited to 'mdoc.c') diff --git a/mdoc.c b/mdoc.c index 3863b6ab..929d0208 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.230 2014/11/28 01:05:43 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.231 2014/11/28 03:14:18 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze @@ -383,7 +383,7 @@ node_alloc(struct mdoc *mdoc, int line, int pos, return(p); } -int +void mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; @@ -391,24 +391,22 @@ mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); } -int +struct mdoc_node * mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; assert(mdoc->first); assert(mdoc->last); - p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +struct mdoc_node * mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; @@ -416,10 +414,10 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +void mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_node *body, enum mdoc_endbody end) { @@ -431,10 +429,9 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, p->end = end; node_append(mdoc, p); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } -int +struct mdoc_node * mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { @@ -462,10 +459,10 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, } node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +void mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { @@ -485,10 +482,9 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, } node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); } -int +void mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) { struct mdoc_node *n; @@ -497,7 +493,6 @@ mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) n->string = roff_strdup(mdoc->roff, p); node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } void @@ -579,13 +574,12 @@ mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) mdoc_node_free(p); } -int +void mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) { mdoc_node_unlink(mdoc, p); node_append(mdoc, p); - return(1); } /* @@ -669,7 +663,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, line, (int)(ws-buf), NULL); - if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { + if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, line, (int)(c - buf), NULL); @@ -678,19 +672,15 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) * blank lines aren't allowed, but enough manuals assume this * behaviour that we want to work around it. */ - if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL)) - return(0); - + mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL); mdoc->next = MDOC_NEXT_SIBLING; - mdoc_valid_post(mdoc); return(1); } - if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) - return(0); + mdoc_word_alloc(mdoc, line, offs, buf+offs); - if (MDOC_LITERAL & mdoc->flags) + if (mdoc->flags & MDOC_LITERAL) return(1); /* -- cgit v1.2.3-56-ge451