From c07eec64597c11cbcc0afd1edbe5ba5b6d82e609 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Fri, 6 Mar 2009 05:13:12 +0000 Subject: 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. --- lib/libarchive/archive_util.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'lib/libarchive') diff --git a/lib/libarchive/archive_util.c b/lib/libarchive/archive_util.c index 767987e13f6f..bc39a4da1877 100644 --- a/lib/libarchive/archive_util.c +++ b/lib/libarchive/archive_util.c @@ -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 error_number, const char *fmt, ...) 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; } -- cgit v1.2.3