Skip to content

Commit

Permalink
libs: sigwait: Fix compilation warning around sigprocmask()
Browse files Browse the repository at this point in the history
Newer gcc generates following warnings currently:

sigwait.c: In function ‘test_masked_matching’:
sigwait.c:157:42: warning: passing argument 3 to restrict-qualified parameter aliases with argument 2 [-Wrestrict]
  157 |  TEST(sigprocmask(SIG_SETMASK, &oldmask, &oldmask));

Fix these by replacing the third argument with sigs or removing it if
not required.

Also improve a comment while at it.

Reported-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
  • Loading branch information
vireshk authored and metan-ucw committed Jul 30, 2020
1 parent 0862350 commit 0567c08
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions libs/libltpsigwait/sigwait.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ void test_masked_matching(swi_func sigwaitinfo, int signo,
&& si.si_code == SI_USER
&& si.si_signo == signo, "Struct siginfo mismatch");

TEST(sigprocmask(SIG_SETMASK, &oldmask, &oldmask));
TEST(sigprocmask(SIG_SETMASK, &oldmask, &sigs));
if (TST_RET == -1)
tst_brk(TBROK | TTERRNO, "restoring original signal mask failed");

if (sigismember(&oldmask, signo))
if (sigismember(&sigs, signo))
tst_res(TPASS, "sigwaitinfo restored the original mask");
else
tst_res(TFAIL,
Expand Down Expand Up @@ -214,11 +214,11 @@ void test_masked_matching_rt(swi_func sigwaitinfo, int signo,
&& si.si_signo == signo + 1,
"Struct siginfo mismatch");

TEST(sigprocmask(SIG_SETMASK, &oldmask, &oldmask));
TEST(sigprocmask(SIG_SETMASK, &oldmask, &sigs));
if (TST_RET == -1)
tst_brk(TBROK | TTERRNO, "restoring original signal mask failed");

if (sigismember(&oldmask, signo))
if (sigismember(&sigs, signo))
tst_res(TPASS, "sigwaitinfo restored the original mask");
else
tst_res(TFAIL,
Expand Down Expand Up @@ -250,11 +250,11 @@ void test_masked_matching_noinfo(swi_func sigwaitinfo, int signo,
TEST(sigwaitinfo(&sigs, NULL, NULL));
REPORT_SUCCESS(signo, 0);

TEST(sigprocmask(SIG_SETMASK, &oldmask, &oldmask));
TEST(sigprocmask(SIG_SETMASK, &oldmask, &sigs));
if (TST_RET == -1)
tst_brk(TBROK | TTERRNO, "restoring original signal mask failed");

if (sigismember(&oldmask, signo))
if (sigismember(&sigs, signo))
tst_res(TPASS, "sigwaitinfo restored the original mask");
else
tst_res(TFAIL,
Expand Down Expand Up @@ -289,9 +289,9 @@ void test_bad_address(swi_func sigwaitinfo, int signo,
TEST(sigwaitinfo(&sigs, (void *)1, NULL));
REPORT_SUCCESS(-1, EFAULT);

TEST(sigprocmask(SIG_SETMASK, &oldmask, &oldmask));
TEST(sigprocmask(SIG_SETMASK, &oldmask, NULL));
if (TST_RET == -1)
tst_brk(TBROK | TTERRNO, "sigprocmask() failed");
tst_brk(TBROK | TTERRNO, "restoring original signal mask failed");

SAFE_KILL(child, SIGTERM);
SAFE_WAIT(NULL);
Expand Down

0 comments on commit 0567c08

Please sign in to comment.