diff options
| author |   schwarze <schwarze@openbsd.org> | 2020-01-19 16:16:32 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2020-01-19 16:16:32 +0000 |
| commit | ea5923ab4f5459a73632bd723af7cdc5b0b111cd (patch) | |
| tree | 97ad8d983f26f83c7e74dcaedfef9868733ff4d7 /usr.bin/mandoc/man_validate.c | |
| parent | eso(4): do not retake audio_lock during drain (diff) | |
| download | wireguard-openbsd-ea5923ab4f5459a73632bd723af7cdc5b0b111cd.tar.xz wireguard-openbsd-ea5923ab4f5459a73632bd723af7cdc5b0b111cd.zip | |
Align to the new, sane behaviour of the groff_mdoc(7) .Dd macro:
without an argument, use the empty string, and always concatenate
all arguments, no matter their number.
This allows reducing the number of arguments of mandoc_normdate()
and some other simplifications, at the same time polishing some
error messages by adding the name of the macro in question.
Diffstat (limited to 'usr.bin/mandoc/man_validate.c')
| -rw-r--r-- | usr.bin/mandoc/man_validate.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c index 870064019a2..897fead07cf 100644 --- a/usr.bin/mandoc/man_validate.c +++ b/usr.bin/mandoc/man_validate.c @@ -1,7 +1,7 @@ -/* $OpenBSD: man_validate.c,v 1.119 2019/06/27 15:05:14 schwarze Exp $ */ +/* $OpenBSD: man_validate.c,v 1.120 2020/01/19 16:16:32 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -183,7 +183,7 @@ check_root(CHKARGS) man->meta.title = mandoc_strdup(""); man->meta.msec = mandoc_strdup(""); - man->meta.date = mandoc_normdate(man, NULL, n->line, n->pos); + man->meta.date = mandoc_normdate(NULL, NULL); } if (man->meta.os_e && @@ -399,15 +399,10 @@ post_TH(CHKARGS) if (n != NULL) n = n->next; - if (n != NULL && n->string != NULL && n->string[0] != '\0') - man->meta.date = mandoc_normdate(man, - n->string, n->line, n->pos); - else { + if (man->quick && n != NULL) man->meta.date = mandoc_strdup(""); - mandoc_msg(MANDOCERR_DATE_MISSING, - n == NULL ? nb->line : n->line, - n == NULL ? nb->pos : n->pos, "TH"); - } + else + man->meta.date = mandoc_normdate(n, nb); /* TITLE MSEC DATE ->OS<- VOL */ |