=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.164 retrieving revision 1.165 diff -u -p -r1.164 -r1.165 --- mandoc/man.c 2015/09/04 21:25:00 1.164 +++ mandoc/man.c 2015/10/06 18:32:19 1.165 @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.164 2015/09/04 21:25:00 schwarze Exp $ */ +/* $Id: man.c,v 1.165 2015/10/06 18:32:19 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2013, 2014, 2015 Ingo Schwarze @@ -62,9 +62,9 @@ man_parseln(struct roff_man *man, int ln, char *buf, i if (man->last->type != ROFFT_EQN || ln > man->last->line) man->flags |= MAN_NEWLINE; - return (roff_getcontrol(man->roff, buf, &offs) ? + return roff_getcontrol(man->roff, buf, &offs) ? man_pmacro(man, ln, buf, offs) : - man_ptext(man, ln, buf, offs)); + man_ptext(man, ln, buf, offs); } static void @@ -97,7 +97,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i if (man->flags & MAN_LITERAL) { roff_word_alloc(man, line, offs, buf + offs); man_descope(man, line, offs); - return(1); + return 1; } for (i = offs; buf[i] == ' '; i++) @@ -115,7 +115,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i roff_elem_alloc(man, line, offs, MAN_sp); man->next = ROFF_NEXT_SIBLING; } - return(1); + return 1; } /* @@ -152,7 +152,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i man->last->flags |= MAN_EOS; man_descope(man, line, offs); - return(1); + return 1; } static int @@ -183,7 +183,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in if (tok == TOKEN_NONE) { mandoc_msg(MANDOCERR_MACRO, man->parse, ln, ppos, buf + ppos - 1); - return(1); + return 1; } /* Skip a leading escape sequence or tab. */ @@ -234,7 +234,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in n = man->last; if (n->type == ROFFT_BODY && strcmp(n->prev->child->string, "NAME")) - return(2); + return 2; } /* @@ -245,14 +245,14 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in if ( ! bline || man->flags & MAN_ELINE || man_macros[tok].flags & MAN_NSCOPED) - return(1); + return 1; assert(man->flags & MAN_BLINE); man->flags &= ~MAN_BLINE; man_unscope(man, man->last->parent); roff_body_alloc(man, ln, ppos, man->last->tok); - return(1); + return 1; } void @@ -330,5 +330,5 @@ man_mparse(const struct roff_man *man) { assert(man && man->parse); - return(man->parse); + return man->parse; }