From owner-svn-src-all@FreeBSD.ORG  Mon Dec 28 02:33:22 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BBD00106568D;
	Mon, 28 Dec 2009 02:33:22 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB8B78FC1B;
	Mon, 28 Dec 2009 02:33:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBS2XMIG076096;
	Mon, 28 Dec 2009 02:33:22 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS2XM4k076094;
	Mon, 28 Dec 2009 02:33:22 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912280233.nBS2XM4k076094@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 02:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201095 - head/lib/libarchive
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Dec 2009 02:33:22 -0000

Author: kientzle
Date: Mon Dec 28 02:33:22 2009
New Revision: 201095
URL: http://svn.freebsd.org/changeset/base/201095

Log:
  Remove an unused variable and an unnecessary increment.

Modified:
  head/lib/libarchive/archive_string.c

Modified: head/lib/libarchive/archive_string.c
==============================================================================
--- head/lib/libarchive/archive_string.c	Mon Dec 28 02:29:21 2009	(r201094)
+++ head/lib/libarchive/archive_string.c	Mon Dec 28 02:33:22 2009	(r201095)
@@ -291,12 +291,10 @@ __archive_string_utf8_w(struct archive_s
 	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_s
 		} else
 			*dest++ = wc;
 	}
-	*dest++ = L'\0';
+	*dest = L'\0';
 	return (ws);
 }