From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 23 May 2009 17:29:00 +0000 (-0400)
Subject: Rename a scratch variable.  This is used to workaround
X-Git-Tag: v2.8.0~646
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd52472d0ea2157eb239f44dc60966fef4d0621a;p=thirdparty%2Flibarchive.git

Rename a scratch variable.  This is used to workaround
a bug with some versions of GCC that don't support
cast-to-void for explicitly ignoring return values.

SVN-Revision: 1094
---

diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
index 985fa093d..e427da877 100644
--- a/libarchive/archive_write_set_format_pax.c
+++ b/libarchive/archive_write_set_format_pax.c
@@ -949,8 +949,8 @@ archive_write_pax_header(struct archive_write *a,
 		if (r != 0) {
 			const char *msg = "archive_write_pax_header: "
 			    "'x' header failed?!  This can't happen.\n";
-			size_t s = write(2, msg, strlen(msg));
-			(void)s; /* UNUSED */
+			size_t u = write(2, msg, strlen(msg));
+			(void)u; /* UNUSED */
 			exit(1);
 		}
 		r = (a->compressor.write)(a, paxbuff, 512);