diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-02-04 18:58:10 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-02-04 18:58:10 +0000 |
| commit | a31c946fa23f967ed386c1f863572d8b0b595816 (patch) | |
| tree | 5d4f1a98534c8348618d15440a1a1ee117b875ee | |
| parent | 2abdea8dd24252d6e41ca4a6954edff1fe8d3454 (diff) | |
fix column numbers of macro arguments in messages
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint | 6 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint | 18 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bl/column.out_lint | 2 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_argv.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint index 38bd1135d8e..25d51a2efb4 100644 --- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint @@ -1,7 +1,7 @@ -mandoc: badargs.in:9:20: WARNING: empty argument, using 0n: Bd -offset +mandoc: badargs.in:9:13: WARNING: empty argument, using 0n: Bd -offset mandoc: badargs.in:12:2: ERROR: skipping all arguments: Ed tail argument -mandoc: badargs.in:14:43: WARNING: duplicate argument: Bd -compact -mandoc: badargs.in:14:51: WARNING: duplicate argument: Bd -offset 6n +mandoc: badargs.in:14:34: WARNING: duplicate argument: Bd -compact +mandoc: badargs.in:14:43: WARNING: duplicate argument: Bd -offset 6n mandoc: badargs.in:19:2: WARNING: missing display type, using -ragged: Bd mandoc: badargs.in:24:2: WARNING: skipping duplicate display type: Bd -unfilled mandoc: badargs.in:28:2: WARNING: skipping duplicate display type: Bd -ragged diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint index 417d9988f27..84dc961ba06 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint @@ -1,12 +1,12 @@ -mandoc: badargs.in:9:20: WARNING: empty argument, using 0n: Bl -offset -mandoc: badargs.in:14:19: WARNING: empty argument, using 0n: Bl -width -mandoc: badargs.in:18:17: WARNING: empty argument, using 0n: Bl -width -mandoc: badargs.in:27:19: WARNING: empty argument, using 0n: Bl -width -mandoc: badargs.in:31:17: WARNING: empty argument, using 0n: Bl -width -mandoc: badargs.in:35:16: WARNING: empty argument, using 0n: Bl -width +mandoc: badargs.in:9:13: WARNING: empty argument, using 0n: Bl -offset +mandoc: badargs.in:14:13: WARNING: empty argument, using 0n: Bl -width +mandoc: badargs.in:18:11: WARNING: empty argument, using 0n: Bl -width +mandoc: badargs.in:27:13: WARNING: empty argument, using 0n: Bl -width +mandoc: badargs.in:31:11: WARNING: empty argument, using 0n: Bl -width +mandoc: badargs.in:35:10: WARNING: empty argument, using 0n: Bl -width mandoc: badargs.in:41:2: WARNING: skipping duplicate list type: Bl -enum mandoc: badargs.in:45:2: WARNING: skipping duplicate list type: Bl -bullet -mandoc: badargs.in:50:51: WARNING: duplicate argument: Bl -compact -mandoc: badargs.in:50:59: WARNING: duplicate argument: Bl -offset 2n -mandoc: badargs.in:50:69: WARNING: duplicate argument: Bl -width 6n +mandoc: badargs.in:50:42: WARNING: duplicate argument: Bl -compact +mandoc: badargs.in:50:51: WARNING: duplicate argument: Bl -offset 2n +mandoc: badargs.in:50:62: WARNING: duplicate argument: Bl -width 6n mandoc: badargs.in:53:2: ERROR: skipping all arguments: El tail argument diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/column.out_lint index c6e80a0eecb..dd05a01ca23 100644 --- a/regress/usr.bin/mandoc/mdoc/Bl/column.out_lint +++ b/regress/usr.bin/mandoc/mdoc/Bl/column.out_lint @@ -1,4 +1,4 @@ mandoc: column.in:71:2: ERROR: argument count wrong: columns == 2 (have 1) mandoc: column.in:74:2: ERROR: argument count wrong: columns == 2 (have 4) mandoc: column.in:75:2: ERROR: argument count wrong: columns == 2 (have 5) -mandoc: column.in:78:25: WARNING: skipping -width argument: Bl -column +mandoc: column.in:78:18: WARNING: skipping -width argument: Bl -column diff --git a/usr.bin/mandoc/mdoc_argv.c b/usr.bin/mandoc/mdoc_argv.c index 606eab2dc6f..3c66034205a 100644 --- a/usr.bin/mandoc/mdoc_argv.c +++ b/usr.bin/mandoc/mdoc_argv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_argv.c,v 1.55 2014/11/29 03:37:28 schwarze Exp $ */ +/* $OpenBSD: mdoc_argv.c,v 1.56 2015/02/04 18:58:09 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -337,7 +337,7 @@ mdoc_argv(struct mdoc *mdoc, int line, enum mdoct tok, /* Parse the arguments of the flag. */ tmpv.line = line; - tmpv.pos = ipos; + tmpv.pos = *pos; tmpv.sz = 0; tmpv.value = NULL; |