summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2015-02-10 08:05:08 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2015-02-10 08:05:08 +0000
commit1beae8437be2c5266ebccdd6c98437823846c908 (patch)
treefcbc1e1ea68225097a72d57f2ae99e8018d5e993
parent567344e8ba20fce53881cd2d96fa7c282edfc8b7 (diff)
trim trailing white space, no code change;
from Svyatoslav Mishyn <juef at openmailboxd dot org>, Crux Linux
-rw-r--r--usr.bin/mandoc/cgi.c24
-rw-r--r--usr.bin/mandoc/main.c4
-rw-r--r--usr.bin/mandoc/man_html.c4
-rw-r--r--usr.bin/mandoc/mdoc_validate.c4
4 files changed, 18 insertions, 18 deletions
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index e12f7677328..c18227ffdb9 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgi.c,v 1.42 2015/01/15 04:26:06 schwarze Exp $ */
+/* $OpenBSD: cgi.c,v 1.43 2015/02/10 08:05:07 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -56,10 +56,10 @@ static void catman(const struct req *, const char *);
static void format(const struct req *, const char *);
static void html_print(const char *);
static void html_putchar(char);
-static int http_decode(char *);
+static int http_decode(char *);
static void http_parse(struct req *, const char *);
static void http_print(const char *);
-static void http_putchar(char);
+static void http_putchar(char);
static void http_printquery(const struct req *, const char *);
static void pathgen(struct req *);
static void pg_error_badrequest(const char *);
@@ -184,7 +184,7 @@ http_print(const char *p)
static void
html_print(const char *p)
{
-
+
if (NULL == p)
return;
while ('\0' != *p)
@@ -619,7 +619,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
for (i = 0; i < sz; i++) {
printf("<TR>\n"
"<TD CLASS=\"title\">\n"
- "<A HREF=\"%s/%s/%s?",
+ "<A HREF=\"%s/%s/%s?",
scriptname, req->q.manpath, r[i].file);
http_printquery(req, "&amp;");
printf("\">");
@@ -699,7 +699,7 @@ catman(const struct req *req, const char *file)
while (NULL != (p = fgetln(f, &len))) {
bold = italic = 0;
for (i = 0; i < (int)len - 1; i++) {
- /*
+ /*
* This means that the catpage is out of state.
* Ignore it and keep going (although the
* catpage is bogus).
@@ -740,7 +740,7 @@ catman(const struct req *req, const char *file)
continue;
}
- /*
+ /*
* Handle funny behaviour troff-isms.
* These grok'd from the original man2html.c.
*/
@@ -778,7 +778,7 @@ catman(const struct req *req, const char *file)
}
/* Bold mode. */
-
+
if (italic)
printf("</I>");
if ( ! bold)
@@ -789,9 +789,9 @@ catman(const struct req *req, const char *file)
html_putchar(p[i]);
}
- /*
+ /*
* Clean up the last character.
- * We can get to a newline; don't print that.
+ * We can get to a newline; don't print that.
*/
if (italic)
@@ -889,7 +889,7 @@ pg_show(struct req *req, const char *fullpath)
pg_error_badrequest(
"You did not specify a page to show.");
return;
- }
+ }
manpath = mandoc_strndup(fullpath, file - fullpath);
file++;
@@ -1054,7 +1054,7 @@ main(void)
MAN_DIR, strerror(errno));
pg_error_internal();
return(EXIT_FAILURE);
- }
+ }
memset(&req, 0, sizeof(struct req));
pathgen(&req);
diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c
index dd6006329ec..327bab6d606 100644
--- a/usr.bin/mandoc/main.c
+++ b/usr.bin/mandoc/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.124 2015/02/07 06:27:53 schwarze Exp $ */
+/* $OpenBSD: main.c,v 1.125 2015/02/10 08:05:07 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -543,7 +543,7 @@ found:
fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry,\n"
" consider running # makewhatis %s\n",
progname, name, sec, paths->paths[ipath]);
-
+
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
page = *res + (*ressz - 1);
page->file = file;
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c
index 40f1dcbcdf3..ba03997a7e3 100644
--- a/usr.bin/mandoc/man_html.c
+++ b/usr.bin/mandoc/man_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man_html.c,v 1.63 2015/01/30 22:04:15 schwarze Exp $ */
+/* $OpenBSD: man_html.c,v 1.64 2015/02/10 08:05:07 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -214,7 +214,7 @@ print_man_node(MAN_ARGS)
print_paragraph(h);
return;
}
- if (n->flags & MAN_LINE && (*n->string == ' ' ||
+ if (n->flags & MAN_LINE && (*n->string == ' ' ||
(n->prev != NULL && mh->fl & MANH_LITERAL &&
! (h->flags & HTML_NONEWLINE))))
print_otag(h, TAG_BR, 0, NULL);
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 7dcf7e84aa3..0e4c3a50e23 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_validate.c,v 1.192 2015/02/06 16:05:51 schwarze Exp $ */
+/* $OpenBSD: mdoc_validate.c,v 1.193 2015/02/10 08:05:07 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1806,7 +1806,7 @@ static void
post_sh_see_also(POST_ARGS)
{
const struct mdoc_node *n;
- const char *name, *sec;
+ const char *name, *sec;
const char *lastname, *lastsec, *lastpunct;
int cmp;