Date: Fri, 6 Mar 2009 05:13:12 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r189434 - head/lib/libarchive Message-ID: <200903060513.n265DCck008982@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903060513.n265DCck008982>