From 13f322aec3581063146ed74745ebfedd0830ca49 Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 02:33:22 +0000
Subject: [PATCH] Remove an unused variable and an unnecessary increment.

---
 lib/libarchive/archive_string.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index 111dcb1291de..d68ad5875ae7 100644
--- a/lib/libarchive/archive_string.c
+++ b/lib/libarchive/archive_string.c
@@ -291,12 +291,10 @@ __archive_string_utf8_w(struct archive_string *as)
 	int wc, wc2;/* Must be large enough for a 21-bit Unicode code point. */
 	const char *src;
 	int n;
-	int err;
 
 	ws = (wchar_t *)malloc((as->length + 1) * sizeof(wchar_t));
 	if (ws == NULL)
 		__archive_errx(1, "Out of memory");
-	err = 0;
 	dest = ws;
 	src = as->s;
 	while (*src != '\0') {
@@ -344,7 +342,7 @@ __archive_string_utf8_w(struct archive_string *as)
 		} else
 			*dest++ = wc;
 	}
-	*dest++ = L'\0';
+	*dest = L'\0';
 	return (ws);
 }