summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2019-07-01 22:43:04 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2019-07-01 22:43:04 +0000
commit6cbd41daaf3d4b4e03fd057d511bebbb7d4b93a0 (patch)
tree8b17ec66fd0717a199a3f52786429b17123af3a7
parent76595180d6d6d8df073732a48641de8ff668e159 (diff)
delete trailing whitespace and space-tab sequences; no code change;
patch from Michal Nowak <mnowak at startmail dot com> who found these with git pbchk in the illumos tree
-rw-r--r--usr.bin/mandoc/dbm.c6
-rw-r--r--usr.bin/mandoc/dbm_map.h4
-rw-r--r--usr.bin/mandoc/man_term.c4
-rw-r--r--usr.bin/mandoc/mansearch.c4
-rw-r--r--usr.bin/mandoc/mdoc_markdown.c4
-rw-r--r--usr.bin/mandoc/roff.c6
-rw-r--r--usr.bin/mandoc/tbl_term.c4
7 files changed, 16 insertions, 16 deletions
diff --git a/usr.bin/mandoc/dbm.c b/usr.bin/mandoc/dbm.c
index 9989df4fab3..961274eab31 100644
--- a/usr.bin/mandoc/dbm.c
+++ b/usr.bin/mandoc/dbm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbm.c,v 1.4 2018/11/04 05:32:42 bluhm Exp $ */
+/* $OpenBSD: dbm.c,v 1.5 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
*
@@ -223,7 +223,7 @@ static struct dbm_res
page_bytitle(enum iter arg_iter, const struct dbm_match *arg_match)
{
static const struct dbm_match *match;
- static const char *cp;
+ static const char *cp;
static int32_t ip;
struct dbm_res res = {-1, 0};
@@ -305,7 +305,7 @@ page_byarch(const struct dbm_match *arg_match)
static const struct dbm_match *match;
struct dbm_res res = {-1, 0};
static int32_t ip;
- const char *cp;
+ const char *cp;
/* Initialize for a new iteration. */
diff --git a/usr.bin/mandoc/dbm_map.h b/usr.bin/mandoc/dbm_map.h
index 6a4db57b749..94ee82fb8bc 100644
--- a/usr.bin/mandoc/dbm_map.h
+++ b/usr.bin/mandoc/dbm_map.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbm_map.h,v 1.1 2016/08/01 10:32:39 schwarze Exp $ */
+/* $OpenBSD: dbm_map.h,v 1.2 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
*
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * Private interface for low-level routines for the map-based version
+ * Private interface for low-level routines for the map-based version
* of the mandoc database, for read-only access.
* To be used by dbm*.c only.
*/
diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c
index 82d88b005b4..ebd59958884 100644
--- a/usr.bin/mandoc/man_term.c
+++ b/usr.bin/mandoc/man_term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man_term.c,v 1.182 2019/06/27 12:19:39 schwarze Exp $ */
+/* $OpenBSD: man_term.c,v 1.183 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -313,7 +313,7 @@ pre_alternate(DECL_ARGS)
assert(nn->type == ROFFT_TEXT);
term_word(p, nn->string);
if (nn->flags & NODE_EOS)
- p->flags |= TERMP_SENTENCE;
+ p->flags |= TERMP_SENTENCE;
if (nn->next != NULL)
p->flags |= TERMP_NOSPACE;
}
diff --git a/usr.bin/mandoc/mansearch.c b/usr.bin/mandoc/mansearch.c
index 010adfd06a3..b60f6229a2c 100644
--- a/usr.bin/mandoc/mansearch.c
+++ b/usr.bin/mandoc/mansearch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mansearch.c,v 1.64 2019/04/30 18:48:26 schwarze Exp $ */
+/* $OpenBSD: mansearch.c,v 1.65 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -188,7 +188,7 @@ mansearch(const struct mansearch *search,
mpage->file, R_OK) == -1) {
warn("%s", mpage->file);
warnx("outdated mandoc.db contains "
- "bogus %s entry, run makewhatis %s",
+ "bogus %s entry, run makewhatis %s",
page->file + 1, paths->paths[i]);
free(mpage->file);
free(rp);
diff --git a/usr.bin/mandoc/mdoc_markdown.c b/usr.bin/mandoc/mdoc_markdown.c
index e6ac6f945d0..b35fcb7cd09 100644
--- a/usr.bin/mandoc/mdoc_markdown.c
+++ b/usr.bin/mandoc/mdoc_markdown.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_markdown.c,v 1.30 2018/12/30 00:48:48 schwarze Exp $ */
+/* $OpenBSD: mdoc_markdown.c,v 1.31 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
*
@@ -1290,7 +1290,7 @@ md_post_It(struct roff_node *n)
while ((n = n->prev) != NULL && n->type != ROFFT_HEAD)
i++;
- /*
+ /*
* If a width was specified for this column,
* subtract what printed, and
* add the same spacing as in mdoc_term.c.
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index cfa591d16e7..0b1c5fb652b 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roff.c,v 1.237 2019/04/21 23:45:50 schwarze Exp $ */
+/* $OpenBSD: roff.c,v 1.238 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -781,7 +781,7 @@ roff_reset(struct roff *r)
void
roff_free(struct roff *r)
{
- int i;
+ int i;
roff_free1(r);
for (i = 0; i < r->mstacksz; i++)
@@ -1588,7 +1588,7 @@ char *
roff_getarg(struct roff *r, char **cpp, int ln, int *pos)
{
struct buf buf;
- char *cp, *start;
+ char *cp, *start;
int newesc, pairs, quoted, white;
/* Quoting can only start with a new word. */
diff --git a/usr.bin/mandoc/tbl_term.c b/usr.bin/mandoc/tbl_term.c
index f3e47ad8ed1..479e76c313a 100644
--- a/usr.bin/mandoc/tbl_term.c
+++ b/usr.bin/mandoc/tbl_term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tbl_term.c,v 1.59 2019/06/11 15:40:41 schwarze Exp $ */
+/* $OpenBSD: tbl_term.c,v 1.60 2019/07/01 22:43:03 schwarze Exp $ */
/*
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -162,7 +162,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
const struct tbl_cell *cp, *cpn, *cpp, *cps;
const struct tbl_dat *dp;
static size_t offset;
- size_t save_offset;
+ size_t save_offset;
size_t coloff, tsz;
int hspans, ic, more;
int dvert, fc, horiz, lhori, rhori, uvert;