 @@ -1,14 +1,14 @@
-/*	$NetBSD: conv.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/*	$NetBSD: conv.c,v 1.3 2014/01/07 21:46:47 christos Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 static const char sccsid[] = "Id: conv.c,v 1.27 2001/08/18 21:41:41 skimo Exp  (Berkeley) Date: 2001/08/18 21:41:41 ";
 @@ -43,28 +43,30 @@ typedef int	iconv_t;
 #ifdef USE_WIDECHAR
 static int
 raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
 	const CHAR_T **dst)
+{
     int i;
     CHAR_T **tostr = (CHAR_T **)(void *)&cw->bp1;
     size_t  *blen = &cw->blen1;
     BINC_RETW(NULL, *tostr, *blen, len);
     *tolen = len;
-    for (i = 0; i < len; ++i)
+    for (i = 0; i < len; ++i) {
-	(*tostr)[i] = (u_char) str[i];
+	CHAR_T w = (u_char)str[i];
 	memcpy((*tostr) + i, &w, sizeof(**tostr));
+    }
     *dst = cw->bp1;
     return 0;
+}
 #ifndef ERROR_ON_CONVERT
 #define HANDLE_ICONV_ERROR(o, i, ol, il) do {				\
 		*o++ = *i++;						\
 		ol--; il--;						\
 	} while (/*CONSTCOND*/0)
 #define HANDLE_MBR_ERROR(n, mbs, d, s) do {				\
 		d = s;							\
 @@ -121,31 +123,35 @@ default_char2int(SCR *sp, const char * s
     MEMSET(&mbs, 0, 1);
     BINC_RETW(NULL, *tostr, *blen, nlen);
 #ifdef USE_ICONV
     if (strcmp(nl_langinfo(CODESET), enc)) {
 	id = iconv_open(nl_langinfo(CODESET), enc);
 	if (id == (iconv_t)-1)
 	    goto err;
 	CONVERT(str, left, src, len);
+    }
 #endif
     for (i = 0, j = 0; j < len; ) {
-	n = mbrtowc((*tostr)+i, src+j, len-j, &mbs);
+	CHAR_T w;
 	n = mbrtowc(&w, src + j, len - j, &mbs);
 	memcpy((*tostr) + i, &w, sizeof(**tostr));
 	/* NULL character converted */
-	if (n == (size_t)-2) error = -(len-j);
+	if (n == (size_t)-2) error = -(len - j);
-	if (n == (size_t)-1 || n == (size_t)-2)
+	if (n == (size_t)-1 || n == (size_t)-2) {
-	    HANDLE_MBR_ERROR(n, mbs, (*tostr)[i], src[j]);
+	    HANDLE_MBR_ERROR(n, mbs, w, src[j]);
 	    memcpy((*tostr) + i, &w, sizeof(**tostr));
+	}
 	if (n == 0) n = 1;
 	j += n;
 	if (++i >= *blen) {
 	    nlen += 256;
 	    BINC_RETW(NULL, *tostr, *blen, nlen);
+	}
 	if (id != (iconv_t)-1 && j == len && left) {
 	    CONVERT(str, left, src, len);
 	    j = 0;
+	}
+    }
     *tolen = i;
 @@ -206,28 +212,31 @@ CHAR_T_char2int(SCR *sp, const char * st
+}
 static int
 int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, size_t *tolen,
 	const char **dst)
+{
     int i;
     char **tostr = (char **)(void *)&cw->bp1;
     size_t  *blen = &cw->blen1;
     BINC_RETC(NULL, *tostr, *blen, len);
     *tolen = len;
-    for (i = 0; i < len; ++i)
+    for (i = 0; i < len; ++i) {
-	(*tostr)[i] = str[i];
+	CHAR_T w;
 	memcpy(&w, str + i, sizeof(w));
 	(*tostr)[i] = w;
+    }
     *dst = cw->bp1;
     return 0;
+}
 static int
 default_int2char(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
 		size_t *tolen, const char **pdst, const char *enc)
+{
     size_t i, j;
     int offset = 0;
     char **tostr = (char **)(void *)&cw->bp1;
 @@ -272,42 +281,44 @@ default_int2char(SCR *sp, const CHAR_T *
     BINC_RETC(NULL, *tostr, *blen, nlen);
     dst = *tostr; buflen = *blen;
 #ifdef USE_ICONV
     if (strcmp(nl_langinfo(CODESET), enc)) {
 	id = iconv_open(enc, nl_langinfo(CODESET));
 	if (id == (iconv_t)-1)
 	    goto err;
 	dst = buffer; buflen = CONV_BUFFER_SIZE;
+    }
 #endif
     for (i = 0, j = 0; i < (size_t)len; ++i) {
-	n = wcrtomb(dst+j, str[i], &mbs);
+	CHAR_T w;
 	memcpy(&w, str + i, sizeof(w));
 	n = wcrtomb(dst + j, w, &mbs);
 	if (n == (size_t)-1)
-	   HANDLE_MBR_ERROR(n, mbs, dst[j], str[i]);
+	   HANDLE_MBR_ERROR(n, mbs, dst[j], w);
 	j += n;
 	if (buflen < j + MB_CUR_MAX) {
 	    if (id != (iconv_t)-1) {
 		CONVERT2(j, cw, offset);
 	    } else {
 		nlen += 256;
 		BINC_RETC(NULL, *tostr, *blen, nlen);
 		dst = *tostr; buflen = *blen;
+	    }
+	}
+    }
-    n = wcrtomb(dst+j, L'\0', &mbs);
+    n = wcrtomb(dst + j, L'\0', &mbs);
     j += n - 1;				/* don't count NUL at the end */
     *tolen = j;
     if (id != (iconv_t)-1) {
 	CONVERT2(j, cw, offset);
 	*tolen = offset;
+    }
     *pdst = cw->bp1;
     return 0;
 err:
     *tolen = j;