From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout-kit-01.scc.kit.edu (scc-mailout-kit-01.scc.kit.edu [129.13.231.81]) by mandoc.bsd.lv (OpenSMTPD) with ESMTP id 094a8128 for ; Mon, 1 Jul 2019 18:34:19 -0500 (EST) Received: from asta-nat.asta.uni-karlsruhe.de ([172.22.63.82] helo=hekate.usta.de) by scc-mailout-kit-01.scc.kit.edu with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (envelope-from ) id 1hi5oP-0007Da-9H; Tue, 02 Jul 2019 01:34:18 +0200 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.77) (envelope-from ) id 1hi5oO-0006XI-Cy; Tue, 02 Jul 2019 01:34:16 +0200 Received: from athene.usta.de ([172.24.96.10]) by donnerwolke.usta.de with esmtp (Exim 4.84_2) (envelope-from ) id 1hi5oO-0004tr-9G; Tue, 02 Jul 2019 01:34:16 +0200 Received: from localhost (athene.usta.de [local]) by athene.usta.de (OpenSMTPD) with ESMTPA id 99891ea5; Tue, 2 Jul 2019 01:34:16 +0200 (CEST) Date: Tue, 2 Jul 2019 01:34:16 +0200 From: Ingo Schwarze To: Michal Nowak Cc: discuss@mandoc.bsd.lv Subject: Re: mandoc 1.14.5 white space nits Message-ID: <20190701233416.GJ91131@athene.usta.de> References: X-Mailinglist: mandoc-discuss Reply-To: discuss@mandoc.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.0 (2017-02-23) Hi Michael, Michal Nowak wrote on Fri, Jun 14, 2019 at 06:01:01PM +0200: > I am just finishing mandoc update to 1.14.5 on illumos Nice. I also noted it on http://mandoc.bsd.lv/ports.html and http://mandoc.bsd.lv/porthistory.html > and while preparing the change-set for integration > I run our `git pbchk` tool [1]. > > It found one misspelling, and couple of sequences and > trailing spaces: Thanks for the report. > Let me know, if you apply it in some form. I applied it by hand (because whitespace patches are hard to read and also because i slightly mistrust patches prepared with git). Yours, Ingo Log Message: ----------- use the standard spelling of the word "idiosyncrasy"; suggested by Michal Nowak Modified Files: -------------- mandoc: roff.7 Revision Data ------------- Index: roff.7 =================================================================== RCS file: /home/cvs/mandoc/mandoc/roff.7,v retrieving revision 1.112 retrieving revision 1.113 diff -Lroff.7 -Lroff.7 -u -p -r1.112 -r1.113 --- roff.7 +++ roff.7 @@ -2278,7 +2278,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 7 Log Message: ----------- delete trailing whitespace and space-tab sequences; no code change; patch from Michal Nowak who found these with git pbchk in the illumos tree Modified Files: -------------- mandoc: configure dbm.c dbm_map.h lib.in man_term.c mansearch.c mdoc_markdown.c roff.c tbl_term.c mandoc/regress: regress.pl Revision Data ------------- Index: tbl_term.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/tbl_term.c,v retrieving revision 1.71 retrieving revision 1.72 diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.71 -r1.72 --- tbl_term.c +++ tbl_term.c @@ -164,7 +164,7 @@ term_tbl(struct termp *tp, const struct 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; Index: mansearch.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/mansearch.c,v retrieving revision 1.81 retrieving revision 1.82 diff -Lmansearch.c -Lmansearch.c -u -p -r1.81 -r1.82 --- mansearch.c +++ 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); Index: lib.in =================================================================== RCS file: /home/cvs/mandoc/mandoc/lib.in,v retrieving revision 1.21 retrieving revision 1.22 diff -Llib.in -Llib.in -u -p -r1.21 -r1.22 --- lib.in +++ lib.in @@ -43,7 +43,7 @@ LINE("libcipher", "FreeSec Crypt Library LINE("libcompat", "Compatibility Library (libcompat, \\-lcompat)") LINE("libcrypt", "Crypt Library (libcrypt, \\-lcrypt)") LINE("libcurses", "Curses Library (libcurses, \\-lcurses)") -LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)") +LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)") LINE("libdevattr", "Device attribute and event library (libdevattr, \\-ldevattr)") LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)") LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)") Index: dbm_map.h =================================================================== RCS file: /home/cvs/mandoc/mandoc/dbm_map.h,v retrieving revision 1.1 retrieving revision 1.2 diff -Ldbm_map.h -Ldbm_map.h -u -p -r1.1 -r1.2 --- dbm_map.h +++ dbm_map.h @@ -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. */ Index: roff.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/roff.c,v retrieving revision 1.365 retrieving revision 1.366 diff -Lroff.c -Lroff.c -u -p -r1.365 -r1.366 --- roff.c +++ roff.c @@ -783,7 +783,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++) @@ -1590,7 +1590,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. */ Index: man_term.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/man_term.c,v retrieving revision 1.229 retrieving revision 1.230 diff -Lman_term.c -Lman_term.c -u -p -r1.229 -r1.230 --- man_term.c +++ man_term.c @@ -315,7 +315,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; } Index: dbm.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/dbm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -Ldbm.c -Ldbm.c -u -p -r1.6 -r1.7 --- dbm.c +++ 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_ 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. */ Index: mdoc_markdown.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/mdoc_markdown.c,v retrieving revision 1.30 retrieving revision 1.31 diff -Lmdoc_markdown.c -Lmdoc_markdown.c -u -p -r1.30 -r1.31 --- mdoc_markdown.c +++ 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. Index: configure =================================================================== RCS file: /home/cvs/mandoc/mandoc/configure,v retrieving revision 1.70 retrieving revision 1.71 diff -Lconfigure -Lconfigure -u -p -r1.70 -r1.71 --- configure +++ configure @@ -529,7 +529,7 @@ fi echo "extern char *mkdtemp(char *);" if [ ${HAVE_PROGNAME} -eq 0 ]; then - echo "extern const char *getprogname(void);" + echo "extern const char *getprogname(void);" echo "extern void setprogname(const char *);" fi Index: regress.pl =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/regress.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -Lregress/regress.pl -Lregress/regress.pl -u -p -r1.10 -r1.11 --- regress/regress.pl +++ regress/regress.pl @@ -424,7 +424,7 @@ if ($count_total == 1) { print "\n"; } else { print "No tests were run.\n"; -} +} if ($targets{clean}) { if ($count_rm) { print "Deleted $count_rm test output files.\n"; -- To unsubscribe send an email to discuss+unsubscribe@mandoc.bsd.lv