Page MenuHomeFreeBSD
Files F146358811

D34306.id102855.diff
No OneTemporary
Actions

D34306.id102855.diff
View Options

diff --git a/tools/regression/pthread/cv_cancel1/cv_cancel1.c b/tools/regression/pthread/cv_cancel1/cv_cancel1.c
--- 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,7 @@
return (NULL);
}
-int main(int argc, char **argv)
+int main(int argc __unused, char **argv __unused)
{
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
--- 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 @@
}
int
-main(int argc, char *argv[])
+main(int argc __unused, char *argv[] __unused)
{
pthread_t thr;
pthread_mutex_t mtx;
diff --git a/tools/regression/pthread/unwind/Test.cpp b/tools/regression/pthread/unwind/Test.cpp
--- 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 @@
};
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
--- 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
--- 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
--- 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 @@
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
--- 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
--- 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;

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 3, 1:33 AM (6 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29176532
Default Alt Text
D34306.id102855.diff (3 KB)

Event Timeline