diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-07-26 02:17:30 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-07-26 02:17:30 +0000 |
| commit | df5e56d243ae989b2ab7f40c5f33799380472ece (patch) | |
| tree | d82f4f6035a0b764333fc54cc30afb7f63f53492 /usr.bin | |
| parent | ea862ffebd1b3edfb0e63ade6580ea8f38df877a (diff) | |
sync to 1.8.1: removed excessively verbose EARGVPARM warning
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mandoc/libmdoc.h | 3 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc.c | 3 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_argv.c | 12 |
3 files changed, 5 insertions, 13 deletions
diff --git a/usr.bin/mandoc/libmdoc.h b/usr.bin/mandoc/libmdoc.h index caee3b97f25..518136a160b 100644 --- a/usr.bin/mandoc/libmdoc.h +++ b/usr.bin/mandoc/libmdoc.h @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.15 2009/07/18 19:44:38 schwarze Exp $ */ +/* $Id: libmdoc.h,v 1.16 2009/07/26 02:17:29 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -44,7 +44,6 @@ struct mdoc { enum merr { ETAILWS = 0, ECOLEMPTY, - EARGVPARM, EQUOTPARM, EQUOTTERM, EMALLOC, diff --git a/usr.bin/mandoc/mdoc.c b/usr.bin/mandoc/mdoc.c index 10b67297697..b8808f8ec31 100644 --- a/usr.bin/mandoc/mdoc.c +++ b/usr.bin/mandoc/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.20 2009/07/26 01:59:46 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.21 2009/07/26 02:17:29 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -26,7 +26,6 @@ const char *const __mdoc_merrnames[MERRMAX] = { "trailing whitespace", /* ETAILWS */ "empty last list column", /* ECOLEMPTY */ - "argument-like parameter", /* EARGVPARM */ "unexpected quoted parameter", /* EQUOTPARM */ "unterminated quoted parameter", /* EQUOTTERM */ "system: malloc error", /* EMALLOC */ diff --git a/usr.bin/mandoc/mdoc_argv.c b/usr.bin/mandoc/mdoc_argv.c index 352460b5ede..e4243059728 100644 --- a/usr.bin/mandoc/mdoc_argv.c +++ b/usr.bin/mandoc/mdoc_argv.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_argv.c,v 1.10 2009/07/26 01:59:46 schwarze Exp $ */ +/* $Id: mdoc_argv.c,v 1.11 2009/07/26 02:17:29 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -268,8 +268,6 @@ mdoc_argv(struct mdoc *m, int line, int tok, /* XXX - restore saved zeroed byte. */ if (sv) buf[*pos - 1] = sv; - if ( ! mdoc_pwarn(m, line, i, EARGVPARM)) - return(ARGV_ERROR); return(ARGV_WORD); } @@ -392,8 +390,8 @@ mdoc_args(struct mdoc *m, int line, static int -args(struct mdoc *m, int line, - int *pos, char *buf, int fl, char **v) +args(struct mdoc *m, int line, int *pos, + char *buf, int fl, char **v) { int i; char *p, *pp; @@ -407,10 +405,6 @@ args(struct mdoc *m, int line, if ( ! mdoc_pwarn(m, line, *pos, EQUOTPARM)) return(ARGS_ERROR); - if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) - if ( ! mdoc_pwarn(m, line, *pos, EARGVPARM)) - return(ARGS_ERROR); - /* * If the first character is a delimiter and we're to look for * delimited strings, then pass down the buffer seeing if it |