git: f2ce8d6d5335 - stable/15 - libarchive: Staticize some variables
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Apr 2026 13:44:19 UTC
The branch stable/15 has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=f2ce8d6d53355b50f3f1c1887a58839fb598a497
commit f2ce8d6d53355b50f3f1c1887a58839fb598a497
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-04-18 08:25:35 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-04-22 13:43:40 +0000
libarchive: Staticize some variables
This code was not being built due to errors in our libarchive
configuration. Now that those have been addressed, staticize some
variables that trip a “no previous extern declaration” error. This
is a subset of upstream PR 2962.
MFC after: 1 week
Reviewed by: mm
Differential Revision: https://reviews.freebsd.org/D56471
(cherry picked from commit 7e9d974bc023755161742f66c8c77546bab88586)
---
contrib/libarchive/test_utils/test_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/libarchive/test_utils/test_main.c b/contrib/libarchive/test_utils/test_main.c
index 1f641bbe8db7..f7364c0ba4e8 100644
--- a/contrib/libarchive/test_utils/test_main.c
+++ b/contrib/libarchive/test_utils/test_main.c
@@ -187,10 +187,10 @@ const char *testprog;
#ifdef RUN_TEST_UNPRIV
/* Unprivileged user to run as */
-const char *tuser = "nobody";
+static const char *tuser = "nobody";
/* Original and test credentials */
-uid_t ouid, tuid;
-uid_t ogid, tgid;
+static uid_t ouid, tuid;
+static uid_t ogid, tgid;
#endif
#if defined(_WIN32) && !defined(__CYGWIN__)