From 4dd2ae60c22045bc4e4f53a0cf45028322168ec0 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 11 Sep 2020 16:12:48 +0000
Subject: [PATCH] libarchive: import fix for WARNS=6 builds in testing bits

Two more cases of explicitly marking globals for internal linkage where they
need not be shared. Committed upstream as of a38e62314a1f.
---
 test_utils/test_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test_utils/test_main.c b/test_utils/test_main.c
index 7b8aa70fac2a..40dfa52f08f1 100644
--- a/test_utils/test_main.c
+++ b/test_utils/test_main.c
@@ -475,7 +475,7 @@ static struct line {
 	int count;
 	int skip;
 }  failed_lines[10000];
-const char *failed_filename;
+static const char *failed_filename;
 
 /* Count this failure, setup up log destination and handle initial report. */
 static void __LA_PRINTFLIKE(3, 4)
@@ -3458,7 +3458,7 @@ assertion_entry_compare_acls(const char *file, int line,
 /* Use "list.h" to create a list of all tests (functions and names). */
 #undef DEFINE_TEST
 #define	DEFINE_TEST(n) { n, #n, 0 },
-struct test_list_t tests[] = {
+static struct test_list_t tests[] = {
 	#include "list.h"
 };