summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/mandoc/html.c3
-rw-r--r--usr.bin/mandoc/man_html.c3
-rw-r--r--usr.bin/mandoc/man_macro.c3
-rw-r--r--usr.bin/mandoc/mdoc_html.c7
-rw-r--r--usr.bin/mandoc/mdoc_macro.c3
-rw-r--r--usr.bin/mandoc/mdoc_term.c6
-rw-r--r--usr.bin/mandoc/mdoc_validate.c5
-rw-r--r--usr.bin/mandoc/out.c3
-rw-r--r--usr.bin/mandoc/roff.c7
-rw-r--r--usr.bin/mandoc/tbl_opts.c3
-rw-r--r--usr.bin/mandoc/tbl_term.c3
-rw-r--r--usr.bin/mandoc/term.c3
-rw-r--r--usr.bin/mandoc/term_ascii.c3
-rw-r--r--usr.bin/mandoc/tree.c6
14 files changed, 16 insertions, 42 deletions
diff --git a/usr.bin/mandoc/html.c b/usr.bin/mandoc/html.c
index 81fa4141b87..e3062b8c3be 100644
--- a/usr.bin/mandoc/html.c
+++ b/usr.bin/mandoc/html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: html.c,v 1.56 2015/03/27 21:17:16 schwarze Exp $ */
+/* $OpenBSD: html.c,v 1.57 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -222,7 +222,6 @@ print_metaf(struct html *h, enum mandoc_esc deco)
break;
default:
abort();
- /* NOTREACHED */
}
if (h->metaf) {
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c
index 61f8157b765..9a8407156b5 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.70 2015/04/18 17:50:02 schwarze Exp $ */
+/* $OpenBSD: man_html.c,v 1.71 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -425,7 +425,6 @@ man_alt_pre(MAN_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
if (i)
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index d2af05db232..166c60023ae 100644
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man_macro.c,v 1.72 2015/09/04 21:24:26 schwarze Exp $ */
+/* $OpenBSD: man_macro.c,v 1.73 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -223,7 +223,6 @@ blk_close(MACRO_PROT_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
for (nn = man->last->parent; nn; nn = nn->parent)
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index 45a4f87c2d4..7562b488d38 100644
--- a/usr.bin/mandoc/mdoc_html.c
+++ b/usr.bin/mandoc/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_html.c,v 1.110 2015/09/26 00:32:17 schwarze Exp $ */
+/* $OpenBSD: mdoc_html.c,v 1.111 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -998,7 +998,6 @@ mdoc_bl_pre(MDOC_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
return(1);
@@ -1995,7 +1994,6 @@ mdoc__x_pre(MDOC_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
if (MDOC__U != n->tok) {
@@ -2042,7 +2040,6 @@ mdoc_bk_pre(MDOC_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
return(1);
@@ -2122,7 +2119,6 @@ mdoc_quote_pre(MDOC_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
h->flags |= HTML_NOSPACE;
@@ -2190,7 +2186,6 @@ mdoc_quote_post(MDOC_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
}
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index 36a1373095f..27e5e7edef0 100644
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_macro.c,v 1.156 2015/05/01 16:56:36 schwarze Exp $ */
+/* $OpenBSD: mdoc_macro.c,v 1.157 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -361,7 +361,6 @@ rew_alt(int tok)
default:
return(tok);
}
- /* NOTREACHED */
}
static void
diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index 0cf99564659..6f36ee36758 100644
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_term.c,v 1.225 2015/09/21 13:24:32 schwarze Exp $ */
+/* $OpenBSD: mdoc_term.c,v 1.226 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1719,7 +1719,6 @@ termp_xx_pre(DECL_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
term_word(p, pp);
@@ -1916,7 +1915,6 @@ termp_quote_pre(DECL_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
p->flags |= TERMP_NOSPACE;
@@ -1987,7 +1985,6 @@ termp_quote_post(DECL_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
}
@@ -2216,7 +2213,6 @@ termp_bk_pre(DECL_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
return(1);
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 543b5d7ef98..65825cb7c04 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.208 2015/09/14 15:35:47 schwarze Exp $ */
+/* $OpenBSD: mdoc_validate.c,v 1.209 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -655,7 +655,6 @@ pre_bd(PRE_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
if (DISP__NONE == dt)
continue;
@@ -1029,7 +1028,6 @@ post_defaults(POST_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
mdoc->last = nn;
}
@@ -2079,7 +2077,6 @@ pre_literal(PRE_ARGS)
break;
default:
abort();
- /* NOTREACHED */
}
}
diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c
index 7d3f8fd09ac..d2e8a146f7f 100644
--- a/usr.bin/mandoc/out.c
+++ b/usr.bin/mandoc/out.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: out.c,v 1.31 2015/01/30 04:08:37 schwarze Exp $ */
+/* $OpenBSD: out.c,v 1.32 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -260,7 +260,6 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
break;
default:
abort();
- /* NOTREACHED */
}
}
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index 7d67d434ded..23ec4aa401b 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roff.c,v 1.147 2015/08/29 23:55:53 schwarze Exp $ */
+/* $OpenBSD: roff.c,v 1.148 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1020,7 +1020,6 @@ roff_node_append(struct roff_man *man, struct roff_node *n)
break;
default:
abort();
- /* NOTREACHED */
}
n->parent->nchild++;
n->parent->last = n;
@@ -2058,12 +2057,12 @@ roff_getnum(const char *v, int *pos, int *res, int flags)
scaled = *res * 240 / 2.54;
break;
case 'v':
- /* FALLTROUGH */
+ /* FALLTHROUGH */
case 'P':
scaled = *res * 40;
break;
case 'm':
- /* FALLTROUGH */
+ /* FALLTHROUGH */
case 'n':
scaled = *res * 24;
break;
diff --git a/usr.bin/mandoc/tbl_opts.c b/usr.bin/mandoc/tbl_opts.c
index 2a47162fe26..ea5ec7c073e 100644
--- a/usr.bin/mandoc/tbl_opts.c
+++ b/usr.bin/mandoc/tbl_opts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tbl_opts.c,v 1.12 2015/01/28 17:30:37 schwarze Exp $ */
+/* $OpenBSD: tbl_opts.c,v 1.13 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -97,7 +97,6 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
break;
default:
abort();
- /* NOTREACHED */
}
if (len == 0)
diff --git a/usr.bin/mandoc/tbl_term.c b/usr.bin/mandoc/tbl_term.c
index 7f9080519c2..cd63107d17d 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.28 2015/03/09 17:41:36 schwarze Exp $ */
+/* $OpenBSD: tbl_term.c,v 1.29 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -301,7 +301,6 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts,
break;
default:
abort();
- /* NOTREACHED */
}
}
diff --git a/usr.bin/mandoc/term.c b/usr.bin/mandoc/term.c
index 9b972d5fde0..bcf710ed602 100644
--- a/usr.bin/mandoc/term.c
+++ b/usr.bin/mandoc/term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: term.c,v 1.110 2015/09/21 13:24:32 schwarze Exp $ */
+/* $OpenBSD: term.c,v 1.111 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -818,7 +818,6 @@ term_vspan(const struct termp *p, const struct roffsu *su)
break;
default:
abort();
- /* NOTREACHED */
}
ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
return(ri < 66 ? ri : 1);
diff --git a/usr.bin/mandoc/term_ascii.c b/usr.bin/mandoc/term_ascii.c
index a3bd10cdfa8..a5cac05a4e8 100644
--- a/usr.bin/mandoc/term_ascii.c
+++ b/usr.bin/mandoc/term_ascii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: term_ascii.c,v 1.33 2015/07/17 22:35:36 schwarze Exp $ */
+/* $OpenBSD: term_ascii.c,v 1.34 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -248,7 +248,6 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
break;
default:
abort();
- /* NOTREACHED */
}
return(r > 0.0 ? r + 0.01 : r - 0.01);
}
diff --git a/usr.bin/mandoc/tree.c b/usr.bin/mandoc/tree.c
index 2752a089397..0d34e4d47dd 100644
--- a/usr.bin/mandoc/tree.c
+++ b/usr.bin/mandoc/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.33 2015/04/18 17:50:02 schwarze Exp $ */
+/* $OpenBSD: tree.c,v 1.34 2015/09/26 00:53:15 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -96,7 +96,6 @@ print_mdoc(const struct roff_node *n, int indent)
break;
default:
abort();
- /* NOTREACHED */
}
switch (n->type) {
@@ -136,7 +135,6 @@ print_mdoc(const struct roff_node *n, int indent)
break;
default:
abort();
- /* NOTREACHED */
}
if (n->span) {
@@ -210,7 +208,6 @@ print_man(const struct roff_node *n, int indent)
break;
default:
abort();
- /* NOTREACHED */
}
switch (n->type) {
@@ -236,7 +233,6 @@ print_man(const struct roff_node *n, int indent)
break;
default:
abort();
- /* NOTREACHED */
}
if (n->span) {