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