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