===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- mandoc/mandoc.c	2015/08/29 22:40:05	1.93
+++ mandoc/mandoc.c	2015/10/06 18:32:19	1.94
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.93 2015/08/29 22:40:05 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.94 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -83,7 +83,7 @@ mandoc_escape(const char **end, const char **start, in
 		break;
 	case 'C':
 		if ('\'' != **start)
-			return(ESCAPE_ERROR);
+			return ESCAPE_ERROR;
 		*start = ++*end;
 		gly = ESCAPE_SPECIAL;
 		term = '\'';
@@ -99,7 +99,7 @@ mandoc_escape(const char **end, const char **start, in
 	case ',':
 		/* FALLTHROUGH */
 	case '/':
-		return(ESCAPE_IGNORE);
+		return ESCAPE_IGNORE;
 
 	/*
 	 * The \z escape is supposed to output the following
@@ -108,7 +108,7 @@ mandoc_escape(const char **end, const char **start, in
 	 * let us just skip the next character.
 	 */
 	case 'z':
-		return(ESCAPE_SKIPCHAR);
+		return ESCAPE_SKIPCHAR;
 
 	/*
 	 * Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where
@@ -169,7 +169,7 @@ mandoc_escape(const char **end, const char **start, in
 		/* FALLTHROUGH */
 	case 'o':
 		if (**start == '\0')
-			return(ESCAPE_ERROR);
+			return ESCAPE_ERROR;
 		if (gly == ESCAPE_ERROR)
 			gly = ESCAPE_OVERSTRIKE;
 		term = **start;
@@ -196,7 +196,7 @@ mandoc_escape(const char **end, const char **start, in
 		if (strchr(" %&()*+-./0123456789:<=>", **start)) {
 			if ('\0' != **start)
 				++*end;
-			return(ESCAPE_ERROR);
+			return ESCAPE_ERROR;
 		}
 		gly = ESCAPE_IGNORE;
 		term = **start;
@@ -209,11 +209,11 @@ mandoc_escape(const char **end, const char **start, in
 	 */
 	case 'N':
 		if ('\0' == **start)
-			return(ESCAPE_ERROR);
+			return ESCAPE_ERROR;
 		(*end)++;
 		if (isdigit((unsigned char)**start)) {
 			*sz = 1;
-			return(ESCAPE_IGNORE);
+			return ESCAPE_IGNORE;
 		}
 		(*start)++;
 		while (isdigit((unsigned char)**end))
@@ -221,7 +221,7 @@ mandoc_escape(const char **end, const char **start, in
 		*sz = *end - *start;
 		if ('\0' != **end)
 			(*end)++;
-		return(ESCAPE_NUMBERED);
+		return ESCAPE_NUMBERED;
 
 	/*
 	 * Sizes get a special category of their own.
@@ -283,12 +283,12 @@ mandoc_escape(const char **end, const char **start, in
 		while (**end != term) {
 			switch (**end) {
 			case '\0':
-				return(ESCAPE_ERROR);
+				return ESCAPE_ERROR;
 			case '\\':
 				(*end)++;
 				if (ESCAPE_ERROR ==
 				    mandoc_escape(end, NULL, NULL))
-					return(ESCAPE_ERROR);
+					return ESCAPE_ERROR;
 				break;
 			default:
 				(*end)++;
@@ -299,7 +299,7 @@ mandoc_escape(const char **end, const char **start, in
 	} else {
 		assert(*sz > 0);
 		if ((size_t)*sz > strlen(*start))
-			return(ESCAPE_ERROR);
+			return ESCAPE_ERROR;
 		*end += *sz;
 	}
 
@@ -367,7 +367,7 @@ mandoc_escape(const char **end, const char **start, in
 		break;
 	}
 
-	return(gly);
+	return gly;
 }
 
 /*
@@ -462,7 +462,7 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln
 	if ('\0' == *cp && (white || ' ' == cp[-1]))
 		mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL);
 
-	return(start);
+	return start;
 }
 
 static int
@@ -479,10 +479,10 @@ a2time(time_t *t, const char *fmt, const char *p)
 #endif
 	if (NULL != pp && '\0' == *pp) {
 		*t = mktime(&tm);
-		return(1);
+		return 1;
 	}
 
-	return(0);
+	return 0;
 }
 
 static char *
@@ -495,7 +495,7 @@ time2a(time_t t)
 
 	tm = localtime(&t);
 	if (tm == NULL)
-		return(NULL);
+		return NULL;
 
 	/*
 	 * Reserve space:
@@ -515,11 +515,11 @@ time2a(time_t t)
 
 	if (0 == strftime(p, 4 + 1, "%Y", tm))
 		goto fail;
-	return(buf);
+	return buf;
 
 fail:
 	free(buf);
-	return(NULL);
+	return NULL;
 }
 
 char *
@@ -541,7 +541,7 @@ mandoc_normdate(struct mparse *parse, char *in, int ln
 		t = 0;
 	}
 	out = t ? time2a(t) : NULL;
-	return(out ? out : mandoc_strdup(in));
+	return out ? out : mandoc_strdup(in);
 }
 
 int
@@ -551,7 +551,7 @@ mandoc_eos(const char *p, size_t sz)
 	int		 enclosed, found;
 
 	if (0 == sz)
-		return(0);
+		return 0;
 
 	/*
 	 * End-of-sentence recognition must include situations where
@@ -580,11 +580,12 @@ mandoc_eos(const char *p, size_t sz)
 			found = 1;
 			break;
 		default:
-			return(found && (!enclosed || isalnum((unsigned char)*q)));
+			return found &&
+			    (!enclosed || isalnum((unsigned char)*q));
 		}
 	}
 
-	return(found && !enclosed);
+	return found && !enclosed;
 }
 
 /*
@@ -599,7 +600,7 @@ mandoc_strntoi(const char *p, size_t sz, int base)
 	long		 v;
 
 	if (sz > 31)
-		return(-1);
+		return -1;
 
 	memcpy(buf, p, sz);
 	buf[(int)sz] = '\0';
@@ -608,12 +609,12 @@ mandoc_strntoi(const char *p, size_t sz, int base)
 	v = strtol(buf, &ep, base);
 
 	if (buf[0] == '\0' || *ep != '\0')
-		return(-1);
+		return -1;
 
 	if (v > INT_MAX)
 		v = INT_MAX;
 	if (v < INT_MIN)
 		v = INT_MIN;
 
-	return((int)v);
+	return (int)v;
 }