From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 29 Jun 2014 05:14:35 +0000 (+0900)
Subject: Fix build failure.
X-Git-Tag: v3.1.900a~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7679625dbeb6b9bac6e5080d3903364b33da87fa;p=thirdparty%2Flibarchive.git

Fix build failure.
error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
---

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index fcb0f6901..d21640ee5 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -2289,7 +2289,7 @@ struct test_list_t tests[] = {
  * Summarize repeated failures in the just-completed test.
  */
 static void
-test_summarize(int failed, int skips)
+test_summarize(int failed, int skips_num)
 {
 	unsigned int i;
 
@@ -2299,7 +2299,7 @@ test_summarize(int failed, int skips)
 		fflush(stdout);
 		break;
 	case VERBOSITY_PASSFAIL:
-		printf(failed ? "FAIL\n" : skips ? "ok (S)\n" : "ok\n");
+		printf(failed ? "FAIL\n" : skips_num ? "ok (S)\n" : "ok\n");
 		break;
 	}