===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/preconv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/mandoc/preconv.c	2015/10/06 18:30:44	1.7
--- src/usr.bin/mandoc/preconv.c	2017/02/18 13:43:34	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: preconv.c,v 1.7 2015/10/06 18:30:44 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: preconv.c,v 1.8 2017/02/18 13:43:34 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 24,37 ****
  #include "libmandoc.h"
  
  int
! preconv_encode(struct buf *ib, size_t *ii, struct buf *ob, size_t *oi,
      int *filenc)
  {
! 	unsigned char	*cu;
! 	int		 nby;
! 	unsigned int	 accum;
  
! 	cu = (unsigned char *)ib->buf + *ii;
  	assert(*cu & 0x80);
  
  	if ( ! (*filenc & MPARSE_UTF8))
--- 24,37 ----
  #include "libmandoc.h"
  
  int
! preconv_encode(const struct buf *ib, size_t *ii, struct buf *ob, size_t *oi,
      int *filenc)
  {
! 	const unsigned char	*cu;
! 	int			 nby;
! 	unsigned int		 accum;
  
! 	cu = (const unsigned char *)ib->buf + *ii;
  	assert(*cu & 0x80);
  
  	if ( ! (*filenc & MPARSE_UTF8))
***************
*** 88,94 ****
  	assert(accum < 0xd800 || accum > 0xdfff);
  
  	*oi += snprintf(ob->buf + *oi, 11, "\\[u%.4X]", accum);
! 	*ii = (char *)cu - ib->buf;
  	*filenc &= ~MPARSE_LATIN1;
  	return 1;
  
--- 88,94 ----
  	assert(accum < 0xd800 || accum > 0xdfff);
  
  	*oi += snprintf(ob->buf + *oi, 11, "\\[u%.4X]", accum);
! 	*ii = (const char *)cu - ib->buf;
  	*filenc &= ~MPARSE_LATIN1;
  	return 1;