From 4a61453d9811fa44872cfcf8b0a48b68af92fbf0 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Fri, 14 Jun 2019 16:31:46 +0200 Subject: [PATCH 2/2] mandoc nits --- usr/src/cmd/mandoc/dbm.c | 4 ++-- usr/src/cmd/mandoc/man_term.c | 2 +- usr/src/cmd/mandoc/mansearch.c | 2 +- usr/src/cmd/mandoc/mdoc_markdown.c | 2 +- usr/src/cmd/mandoc/roff.c | 4 ++-- usr/src/cmd/mandoc/tbl_term.c | 2 +- usr/src/man/man5/mandoc_roff.5 | 2 +- usr/src/tools/scripts/webrev.sh | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/usr/src/cmd/mandoc/dbm.c b/usr/src/cmd/mandoc/dbm.c index f6b1259ef5..7637a036a5 100644 --- a/usr/src/cmd/mandoc/dbm.c +++ b/usr/src/cmd/mandoc/dbm.c @@ -233,7 +233,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}; @@ -315,7 +315,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/src/cmd/mandoc/man_term.c b/usr/src/cmd/mandoc/man_term.c index d867762dca..4bb3f9da28 100644 --- a/usr/src/cmd/mandoc/man_term.c +++ b/usr/src/cmd/mandoc/man_term.c @@ -310,7 +310,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/src/cmd/mandoc/mansearch.c b/usr/src/cmd/mandoc/mansearch.c index 0c457f95d1..4e968332e3 100644 --- a/usr/src/cmd/mandoc/mansearch.c +++ b/usr/src/cmd/mandoc/mansearch.c @@ -191,7 +191,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/src/cmd/mandoc/mdoc_markdown.c b/usr/src/cmd/mandoc/mdoc_markdown.c index e9a931218c..b73811b76b 100644 --- a/usr/src/cmd/mandoc/mdoc_markdown.c +++ b/usr/src/cmd/mandoc/mdoc_markdown.c @@ -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/src/cmd/mandoc/roff.c b/usr/src/cmd/mandoc/roff.c index 2b07352b90..e84295aac3 100644 --- a/usr/src/cmd/mandoc/roff.c +++ b/usr/src/cmd/mandoc/roff.c @@ -779,7 +779,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++) @@ -1586,7 +1586,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/src/cmd/mandoc/tbl_term.c b/usr/src/cmd/mandoc/tbl_term.c index a197f8ef74..a411107bd1 100644 --- a/usr/src/cmd/mandoc/tbl_term.c +++ b/usr/src/cmd/mandoc/tbl_term.c @@ -163,7 +163,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; diff --git a/usr/src/man/man5/mandoc_roff.5 b/usr/src/man/man5/mandoc_roff.5 index 01cf99c666..0a9aa7cbd8 100644 --- a/usr/src/man/man5/mandoc_roff.5 +++ b/usr/src/man/man5/mandoc_roff.5 @@ -2279,7 +2279,7 @@ code. .Pp The special semantics of the .Cm nS -number register is an idiosyncracy of +number register is an idiosyncrasy of .Ox manuals and not supported by other .Xr mdoc 5 diff --git a/usr/src/tools/scripts/webrev.sh b/usr/src/tools/scripts/webrev.sh index 2b91ea2548..39f709d444 100644 --- a/usr/src/tools/scripts/webrev.sh +++ b/usr/src/tools/scripts/webrev.sh @@ -873,7 +873,7 @@ html_quote() $SED -e "s/&/\&/g" -e "s//\>/g" "$@" | expand } -# +# # Trim a digest-style revision to a conventionally readable yet useful length # trim_digest() @@ -2075,7 +2075,7 @@ function git_wxfile } } close(F); - + for (sort keys %files) { if ($realfiles{$_} ne $_) { print "$_ $realfiles{$_}\n$files{$_}\n\n"; -- 2.21.0