===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.74
retrieving revision 1.77
diff -u -p -r1.74 -r1.77
--- mandoc/term_ps.c	2015/04/04 17:47:18	1.74
+++ mandoc/term_ps.c	2015/10/12 00:08:16	1.77
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.74 2015/04/04 17:47:18 schwarze Exp $ */
+/*	$Id: term_ps.c,v 1.77 2015/10/12 00:08:16 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <err.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -516,7 +517,7 @@ pdf_alloc(const struct mchars *mchars, const struct ma
 	if (NULL != (p = pspdf_alloc(mchars, outopts)))
 		p->type = TERMTYPE_PDF;
 
-	return(p);
+	return p;
 }
 
 void *
@@ -527,7 +528,7 @@ ps_alloc(const struct mchars *mchars, const struct man
 	if (NULL != (p = pspdf_alloc(mchars, outopts)))
 		p->type = TERMTYPE_PS;
 
-	return(p);
+	return p;
 }
 
 static struct termp *
@@ -582,7 +583,7 @@ pspdf_alloc(const struct mchars *mchars, const struct 
 			pagex = 216;
 			pagey = 356;
 		} else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))
-			fprintf(stderr, "%s: Unknown paper\n", pp);
+			warnx("%s: Unknown paper", pp);
 	}
 
 	/*
@@ -616,7 +617,7 @@ pspdf_alloc(const struct mchars *mchars, const struct 
 	p->ps->lineheight = lineheight;
 
 	p->defrmargin = pagex - (marginx * 2);
-	return(p);
+	return p;
 }
 
 static void
@@ -985,9 +986,7 @@ ps_pletter(struct termp *p, int c)
 
 	switch (c) {
 	case '(':
-		/* FALLTHROUGH */
 	case ')':
-		/* FALLTHROUGH */
 	case '\\':
 		ps_putchar(p, '\\');
 		break;
@@ -1270,7 +1269,7 @@ ps_width(const struct termp *p, int c)
 	else
 		c -= 32;
 
-	return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
+	return (size_t)fonts[(int)TERMFONT_NONE].gly[c].wx;
 }
 
 static int
@@ -1325,7 +1324,7 @@ ps_hspan(const struct termp *p, const struct roffsu *s
 		break;
 	}
 
-	return(r * 24.0);
+	return r * 24.0;
 }
 
 static void