=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- src/usr.bin/mandoc/mdoc.c 2010/05/08 01:52:07 1.44 +++ src/usr.bin/mandoc/mdoc.c 2010/05/08 01:57:33 1.45 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.44 2010/05/08 01:52:07 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.45 2010/05/08 01:57:33 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -147,8 +147,8 @@ enum mdoct, enum mdoc_type); static int node_append(struct mdoc *, struct mdoc_node *); -static int parsetext(struct mdoc *, int, char *); -static int parsemacro(struct mdoc *, int, char *); +static int mdoc_ptext(struct mdoc *, int, char *); +static int mdoc_pmacro(struct mdoc *, int, char *); static int macrowarn(struct mdoc *, int, const char *); static int pstring(struct mdoc *, int, int, const char *, size_t); @@ -277,7 +277,7 @@ /* * Main parse routine. Parses a single line -- really just hands off to - * the macro (parsemacro()) or text parser (parsetext()). + * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int mdoc_parseln(struct mdoc *m, int ln, char *buf) @@ -286,8 +286,8 @@ if (MDOC_HALT & m->flags) return(0); - return('.' == *buf ? parsemacro(m, ln, buf) : - parsetext(m, ln, buf)); + return('.' == *buf ? mdoc_pmacro(m, ln, buf) : + mdoc_ptext(m, ln, buf)); } @@ -626,7 +626,7 @@ * control character. */ static int -parsetext(struct mdoc *m, int line, char *buf) +mdoc_ptext(struct mdoc *m, int line, char *buf) { int i, j; char sv; @@ -743,7 +743,7 @@ * character. */ int -parsemacro(struct mdoc *m, int ln, char *buf) +mdoc_pmacro(struct mdoc *m, int ln, char *buf) { int i, j, c; char mac[5];