1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
From aff0e2a8f011fa80b472355355a7e8cdacd50189 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 Jan 2016 19:53:30 +0000
Subject: [PATCH 11/32] Rename sigset variable to sigset1
sigset API from signal.h is shadowed by this name conflict
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
testcases/kernel/mem/shmt/shmt04.c | 10 +++++-----
testcases/kernel/mem/shmt/shmt06.c | 10 +++++-----
testcases/kernel/syscalls/sigprocmask/sigprocmask01.c | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/testcases/kernel/mem/shmt/shmt04.c b/testcases/kernel/mem/shmt/shmt04.c
index 7203e9e..fce87d6 100644
--- a/testcases/kernel/mem/shmt/shmt04.c
+++ b/testcases/kernel/mem/shmt/shmt04.c
@@ -56,7 +56,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */
/**************/
key_t key;
-sigset_t sigset;
+sigset_t sigset1;
#define SIZE 16*1024
@@ -71,9 +71,9 @@ int main(void)
key = (key_t) getpid();
- sigemptyset(&sigset);
- sigaddset(&sigset, SIGUSR1);
- sigprocmask(SIG_BLOCK, &sigset, NULL);
+ sigemptyset(&sigset1);
+ sigaddset(&sigset1, SIGUSR1);
+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
pid = fork();
switch (pid) {
@@ -148,7 +148,7 @@ int child(void)
char *cp;
int sig;
- sigwait(&sigset, &sig);
+ sigwait(&sigset1, &sig);
chld_pid = getpid();
/*--------------------------------------------------------*/
diff --git a/testcases/kernel/mem/shmt/shmt06.c b/testcases/kernel/mem/shmt/shmt06.c
index a3c9ca3..77b0fc9 100644
--- a/testcases/kernel/mem/shmt/shmt06.c
+++ b/testcases/kernel/mem/shmt/shmt06.c
@@ -57,7 +57,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */
/**************/
key_t key;
-sigset_t sigset;
+sigset_t sigset1;
int child();
static int rm_shm(int);
@@ -70,9 +70,9 @@ int main(void)
key = (key_t) getpid();
- sigemptyset(&sigset);
- sigaddset(&sigset, SIGUSR1);
- sigprocmask(SIG_BLOCK, &sigset, NULL);
+ sigemptyset(&sigset1);
+ sigaddset(&sigset1, SIGUSR1);
+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
pid = fork();
switch (pid) {
@@ -147,7 +147,7 @@ int child(void)
char *cp;
int sig;
- sigwait(&sigset, &sig);
+ sigwait(&sigset1, &sig);
chld_pid = getpid();
if ((shmid = shmget(key, SIZE, 0)) < 0) {
diff --git a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
index 20fca52..6fb1d57 100644
--- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
+++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
@@ -91,7 +91,7 @@ int TST_TOTAL = 1;
int sig_catch = 0; /* variable to blocked/unblocked signals */
struct sigaction sa_new; /* struct to hold signal info */
-sigset_t sigset; /* signal set to hold signal lists */
+sigset_t sigset1; /* signal set to hold signal lists */
sigset_t sigset2;
int main(int ac, char **av)
@@ -112,7 +112,7 @@ int main(int ac, char **av)
* so that, signal will not be delivered to
* the test process.
*/
- TEST(sigprocmask(SIG_BLOCK, &sigset, 0));
+ TEST(sigprocmask(SIG_BLOCK, &sigset1, 0));
/* Get the process id of test process */
my_pid = getpid();
@@ -165,7 +165,7 @@ int main(int ac, char **av)
*/
errno = 0;
if (sigprocmask(SIG_UNBLOCK,
- &sigset, 0) == -1) {
+ &sigset1, 0) == -1) {
tst_brkm(TFAIL, cleanup,
"sigprocmask() failed "
"to unblock signal, "
@@ -212,7 +212,7 @@ void setup(void)
* Initialise the signal sets with the list that
* excludes/includes all system-defined signals.
*/
- if (sigemptyset(&sigset) == -1) {
+ if (sigemptyset(&sigset1) == -1) {
tst_brkm(TFAIL, cleanup,
"sigemptyset() failed, errno=%d : %s",
errno, strerror(errno));
@@ -235,7 +235,7 @@ void setup(void)
* Add specified signal (SIGINT) to the signal set
* which excludes system-defined signals.
*/
- if (sigaddset(&sigset, SIGINT) == -1) {
+ if (sigaddset(&sigset1, SIGINT) == -1) {
tst_brkm(TFAIL, cleanup,
"sigaddset() failed, errno=%d : %s",
errno, strerror(errno));
--
2.7.0
|
