From owner-svn-src-all@FreeBSD.ORG  Fri Mar  6 05:13:13 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 083C91065670;
	Fri,  6 Mar 2009 05:13:13 +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 EA7548FC16;
	Fri,  6 Mar 2009 05:13:12 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n265DC8w008983;
	Fri, 6 Mar 2009 05:13:12 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n265DCck008982;
	Fri, 6 Mar 2009 05:13:12 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903060513.n265DCck008982@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Fri, 6 Mar 2009 05:13:12 +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: r189434 - 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: Fri, 06 Mar 2009 05:13:13 -0000

Author: kientzle
Date: Fri Mar  6 05:13:12 2009
New Revision: 189434
URL: http://svn.freebsd.org/changeset/base/189434

Log:
  Merge r457 from libarchive.googlecode.com:  Stop appending strerror()
  information to error strings.  This caused a lot of unnecessary
  duplication in error messages; in particular, there are a few cases
  where error messages get copied from one archive object to another
  and this would cause the strerror() info to get appended each time.

Modified:
  head/lib/libarchive/archive_util.c

Modified: head/lib/libarchive/archive_util.c
==============================================================================
--- head/lib/libarchive/archive_util.c	Fri Mar  6 05:07:03 2009	(r189433)
+++ head/lib/libarchive/archive_util.c	Fri Mar  6 05:13:12 2009	(r189434)
@@ -155,10 +155,6 @@ void
 archive_set_error(struct archive *a, int error_number, const char *fmt, ...)
 {
 	va_list ap;
-#ifdef HAVE_STRERROR_R
-	char errbuff[512];
-#endif
-	char *errp;
 
 	a->archive_error_number = error_number;
 	if (fmt == NULL) {
@@ -169,21 +165,6 @@ archive_set_error(struct archive *a, int
 	va_start(ap, fmt);
 	archive_string_vsprintf(&(a->error_string), fmt, ap);
 	va_end(ap);
-	if (error_number > 0) {
-		archive_strcat(&(a->error_string), ": ");
-#ifdef HAVE_STRERROR_R
-#ifdef STRERROR_R_CHAR_P
-		errp = strerror_r(error_number, errbuff, sizeof(errbuff));
-#else
-		strerror_r(error_number, errbuff, sizeof(errbuff));
-		errp = errbuff;
-#endif
-#else
-		/* Note: this is not threadsafe! */
-		errp = strerror(error_number);
-#endif
-		archive_strcat(&(a->error_string), errp);
-	}
 	a->error = a->error_string.s;
 }