X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/3e2c5875ed63b44494405e85c9aa899ca0b2c53e..3049172df6f2171ad3b7ba9248f3bd16ab9a966f:/preconv.c

diff --git a/preconv.c b/preconv.c
index a2bbe9ca..1fc137a9 100644
--- a/preconv.c
+++ b/preconv.c
@@ -1,4 +1,4 @@
-/*	$Id: preconv.c,v 1.13 2014/12/19 04:58:35 schwarze Exp $ */
+/*	$Id: preconv.c,v 1.15 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,7 +33,7 @@ preconv_encode(struct buf *ib, size_t *ii, struct buf *ob, size_t *oi,
 	int		 nby;
 	unsigned int	 accum;
 
-	cu = ib->buf + *ii;
+	cu = (unsigned char *)ib->buf + *ii;
 	assert(*cu & 0x80);
 
 	if ( ! (*filenc & MPARSE_UTF8))
@@ -92,17 +92,17 @@ preconv_encode(struct buf *ib, size_t *ii, struct buf *ob, size_t *oi,
 	*oi += snprintf(ob->buf + *oi, 11, "\\[u%.4X]", accum);
 	*ii = (char *)cu - ib->buf;
 	*filenc &= ~MPARSE_LATIN1;
-	return(1);
+	return 1;
 
 latin:
 	if ( ! (*filenc & MPARSE_LATIN1))
-		return(0);
+		return 0;
 
 	*oi += snprintf(ob->buf + *oi, 11,
 	    "\\[u%.4X]", (unsigned char)ib->buf[(*ii)++]);
 
 	*filenc &= ~MPARSE_UTF8;
-	return(1);
+	return 1;
 }
 
 int
@@ -123,7 +123,7 @@ preconv_cue(const struct buf *b, size_t offset)
 
 	if ((sz = (size_t)(eoln - ln)) < 10 ||
 	    memcmp(ln, ".\\\" -*-", 7) || memcmp(eoln - 3, "-*-", 3))
-		return(MPARSE_UTF8 | MPARSE_LATIN1);
+		return MPARSE_UTF8 | MPARSE_LATIN1;
 
 	/* Move after the header and adjust for the trailer. */
 
@@ -162,15 +162,15 @@ preconv_cue(const struct buf *b, size_t offset)
 			sz--;
 		}
 		if (0 == sz)
-			return(0);
+			return 0;
 
 		/* Check us against known encodings. */
 
 		if (phsz > 4 && !strncasecmp(ln, "utf-8", 5))
-			return(MPARSE_UTF8);
+			return MPARSE_UTF8;
 		if (phsz > 10 && !strncasecmp(ln, "iso-latin-1", 11))
-			return(MPARSE_LATIN1);
-		return(0);
+			return MPARSE_LATIN1;
+		return 0;
 	}
-	return(MPARSE_UTF8 | MPARSE_LATIN1);
+	return MPARSE_UTF8 | MPARSE_LATIN1;
 }