diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2014-06-30 23:45:04 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2014-06-30 23:45:04 +0000 |
| commit | 5aff6262067ee7899a92af2ca350794f3a768445 (patch) | |
| tree | b48162e7523c6e7af20abd64c55f963619cf791f | |
| parent | 649af46e85739a15c4151fd2dde9112a1dac87d3 (diff) | |
garbage collect two unused enum mandocerr items
and fix a couple of comments while here
| -rw-r--r-- | usr.bin/mandoc/mandoc.h | 16 | ||||
| -rw-r--r-- | usr.bin/mandoc/read.c | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index b131b10d92f..21f5e1355f0 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.67 2014/06/25 00:19:17 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.68 2014/06/30 23:45:03 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -57,11 +57,11 @@ enum mandocerr { MANDOCERR_DATE_BAD, /* cannot parse date, using it verbatim */ MANDOCERR_PROLOG_ORDER, /* prologue macros out of order */ MANDOCERR_PROLOG_REP, /* duplicate prologue macro */ - MANDOCERR_PROLOG_BAD, /* macro not allowed in prologue */ - MANDOCERR_PROLOG_ONLY, /* macro not allowed in body */ + MANDOCERR_PROLOG_BAD, /* macro not allowed in prologue: macro */ + MANDOCERR_PROLOG_ONLY, /* macro not allowed in body: macro */ /* related to document structure */ - MANDOCERR_SO, /* .so is fragile, better use ln(1) */ + MANDOCERR_SO, /* .so is fragile, better use ln(1): .so path */ MANDOCERR_DOC_EMPTY, /* no document body */ MANDOCERR_SEC_BEFORE, /* content before the first section header */ MANDOCERR_NAMESECFIRST, /* NAME section must come first */ @@ -106,12 +106,9 @@ enum mandocerr { MANDOCERR_BADTAB, /* tab in non-literal context */ MANDOCERR_EOLNSPACE, /* end of line whitespace */ MANDOCERR_BADCOMMENT, /* bad comment style */ - MANDOCERR_BADESCAPE, /* unknown escape sequence */ + MANDOCERR_BADESCAPE, /* bad escape sequence */ MANDOCERR_BADQUOTE, /* unterminated quoted string */ - /* related to equations */ - MANDOCERR_EQNQUOTE, /* unexpected literal in equation */ - MANDOCERR_ERROR, /* ===== start of errors ===== */ /* related to equations */ @@ -151,12 +148,11 @@ enum mandocerr { MANDOCERR_NUMERIC, /* request requires a numeric argument */ MANDOCERR_LISTTYPE, /* missing list type */ MANDOCERR_ARGSLOST, /* line argument(s) will be lost */ - MANDOCERR_BODYLOST, /* body argument(s) will be lost */ MANDOCERR_FATAL, /* ===== start of fatal errors ===== */ MANDOCERR_TOOLARGE, /* input too large */ - MANDOCERR_NOTMANUAL, /* manual isn't really a manual */ + MANDOCERR_NOTMANUAL, /* not a manual */ MANDOCERR_COLUMNS, /* column syntax is inconsistent */ MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */ MANDOCERR_SYNTARGVCOUNT, /* argument count wrong, violates syntax */ diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index 4995a837b2f..4eb2b4d14e5 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.30 2014/06/25 00:19:17 schwarze Exp $ */ +/* $Id: read.c,v 1.31 2014/06/30 23:45:03 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -145,9 +145,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "bad escape sequence", "unterminated quoted string", - /* related to equations */ - "unexpected literal in equation", - "generic error", /* related to equations */ @@ -186,7 +183,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "request requires a numeric argument", "missing list type", "line argument(s) will be lost", - "body argument(s) will be lost", "generic fatal error", |