git: e5f1a45b2473 - stable/13 - Clean up warnings in pthread tests

The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=e5f1a45b2473eb0a3284c085f5278fad9908c960

commit e5f1a45b2473eb0a3284c085f5278fad9908c960
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-02-16 21:10:45 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-05-03 18:20:43 +0000

    Clean up warnings in pthread tests
    
    I intend to move these into lib/libthr/tests/ and connect to kyua.  This
    is a first step to address warnings emitted when building using standard
    make infrastructure.
    
    Reviewed by:    markj
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D34306
    
    (cherry picked from commit ef135466f81bc3f203efa77d1eb81132f7646196)
    (cherry picked from commit 7bfe5e45153b3d214cdb09ced8fccdef02337369)
---
 tools/regression/pthread/cv_cancel1/cv_cancel1.c          | 15 ++++++++-------
 .../pthread/mutex_isowned_np/mutex_isowned_np.c           |  2 +-
 tools/regression/pthread/unwind/Test.cpp                  |  6 +++---
 tools/regression/pthread/unwind/catch_pthread_exit.cpp    |  6 +++---
 tools/regression/pthread/unwind/cond_wait_cancel.cpp      |  8 ++++----
 tools/regression/pthread/unwind/cond_wait_cancel2.cpp     | 12 ++++++------
 tools/regression/pthread/unwind/sem_wait_cancel.cpp       |  6 +++---
 tools/regression/pthread/unwind/thread_normal_exit.cpp    |  4 ++--
 8 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/tools/regression/pthread/cv_cancel1/cv_cancel1.c b/tools/regression/pthread/cv_cancel1/cv_cancel1.c
index 2ae94c5a9f1c..fdc50a866411 100644
--- a/tools/regression/pthread/cv_cancel1/cv_cancel1.c
+++ b/tools/regression/pthread/cv_cancel1/cv_cancel1.c
@@ -32,14 +32,14 @@
 
 #define NLOOPS	10
 
-pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t cv = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cv = PTHREAD_COND_INITIALIZER;
 
-int wake;
-int stop;
+static int wake;
+static int stop;
 
-void *
-thr_routine(void *arg)
+static void *
+thr_routine(void *arg __unused)
 {
 	pthread_mutex_lock(&m);
 	while (wake == 0)
@@ -51,7 +51,8 @@ thr_routine(void *arg)
 	return (NULL);
 }
 
-int main(int argc, char **argv)
+int
+main(void)
 {
 	pthread_t td;
 	int i;
diff --git a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
index 5c23568c33ac..381921c38a06 100644
--- a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
+++ b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
@@ -46,7 +46,7 @@ thread(void *arg)
 }
 
 int
-main(int argc, char *argv[])
+main(void)
 {
 	pthread_t thr;
 	pthread_mutex_t mtx;
diff --git a/tools/regression/pthread/unwind/Test.cpp b/tools/regression/pthread/unwind/Test.cpp
index 9322deff621e..46e451c390b6 100644
--- a/tools/regression/pthread/unwind/Test.cpp
+++ b/tools/regression/pthread/unwind/Test.cpp
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
-int destructed;
-int destructed2;
+static int destructed;
+static int destructed2;
 
 class Test {
 public:
@@ -10,7 +10,7 @@ public:
 };
 
 void
-cleanup_handler(void *arg)
+cleanup_handler(void *arg __unused)
 {
 	destructed2 = 1;
 	printf("%s()\n", __func__);
diff --git a/tools/regression/pthread/unwind/catch_pthread_exit.cpp b/tools/regression/pthread/unwind/catch_pthread_exit.cpp
index 15abc20d1fea..db0e875ccaeb 100644
--- a/tools/regression/pthread/unwind/catch_pthread_exit.cpp
+++ b/tools/regression/pthread/unwind/catch_pthread_exit.cpp
@@ -5,10 +5,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int caught;
+static int caught;
 
-void *
-thr_routine(void *arg)
+static void *
+thr_routine(void *arg __unused)
 {
 	try {
 		pthread_exit(NULL);
diff --git a/tools/regression/pthread/unwind/cond_wait_cancel.cpp b/tools/regression/pthread/unwind/cond_wait_cancel.cpp
index 5975e028a5ca..4dfa57746552 100644
--- a/tools/regression/pthread/unwind/cond_wait_cancel.cpp
+++ b/tools/regression/pthread/unwind/cond_wait_cancel.cpp
@@ -8,11 +8,11 @@
 
 #include "Test.cpp"
 
-pthread_mutex_t mtx;
-pthread_cond_t cv;
+static pthread_mutex_t mtx;
+static pthread_cond_t cv;
 
-void *
-thr(void *arg)
+static void *
+thr(void *arg __unused)
 {
 	Test t;
 
diff --git a/tools/regression/pthread/unwind/cond_wait_cancel2.cpp b/tools/regression/pthread/unwind/cond_wait_cancel2.cpp
index c781068918f1..ba71289fad98 100644
--- a/tools/regression/pthread/unwind/cond_wait_cancel2.cpp
+++ b/tools/regression/pthread/unwind/cond_wait_cancel2.cpp
@@ -13,10 +13,10 @@
 
 #include "Test.cpp"
 
-pthread_mutex_t mtx;
-pthread_cond_t cv;
+static pthread_mutex_t mtx;
+static pthread_cond_t cv;
 
-void f()
+static void f()
 {
 	Test t;
 
@@ -26,13 +26,13 @@ void f()
 	printf("Bug, thread shouldn't be here.\n");
 }
 
-void g()
+static void g()
 {
 	f();
 }
 
-void *
-thr(void *arg)
+static void *
+thr(void *arg __unused)
 {
 	pthread_cleanup_push(cleanup_handler, NULL);
 	g();
diff --git a/tools/regression/pthread/unwind/sem_wait_cancel.cpp b/tools/regression/pthread/unwind/sem_wait_cancel.cpp
index 019164cb3166..2086de6037cb 100644
--- a/tools/regression/pthread/unwind/sem_wait_cancel.cpp
+++ b/tools/regression/pthread/unwind/sem_wait_cancel.cpp
@@ -8,10 +8,10 @@
 
 #include "Test.cpp"
 
-sem_t sem;
+static sem_t sem;
 
-void *
-thr(void *arg)
+static void *
+thr(void *arg __unused)
 {
 	Test t;
 
diff --git a/tools/regression/pthread/unwind/thread_normal_exit.cpp b/tools/regression/pthread/unwind/thread_normal_exit.cpp
index faf900e572c4..70768265be70 100644
--- a/tools/regression/pthread/unwind/thread_normal_exit.cpp
+++ b/tools/regression/pthread/unwind/thread_normal_exit.cpp
@@ -7,8 +7,8 @@
 
 #include "Test.cpp"
 
-void *
-thr_routine(void *arg)
+static void *
+thr_routine(void *arg __unused)
 {
 	Test test;