From 577bae0a13f88bbf0afc2c18d09d9de114b12884 Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" Date: Mon, 3 Aug 2015 15:31:42 +0300 Subject: [PATCH] Eliminate `sigset' shadow warning Signed-off-by: Anton D. Kachalov --- sched/sched/sched_waitid.c | 8 ++++---- sched/sched/sched_waitpid.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sched/sched/sched_waitid.c b/sched/sched/sched_waitid.c index b1b0587f6e4..b4f9a54ed5f 100644 --- a/sched/sched/sched_waitid.c +++ b/sched/sched/sched_waitid.c @@ -159,7 +159,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options) FAR struct child_status_s *child; bool retains; #endif - sigset_t sigset; + sigset_t set; int err; int ret; @@ -184,8 +184,8 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options) /* Create a signal set that contains only SIGCHLD */ - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, SIGCHLD); + (void)sigemptyset(&set); + (void)sigaddset(&set, SIGCHLD); /* Disable pre-emption so that nothing changes while the loop executes */ @@ -352,7 +352,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options) /* Wait for any death-of-child signal */ - ret = sigwaitinfo(&sigset, info); + ret = sigwaitinfo(&set, info); if (ret < 0) { goto errout; diff --git a/sched/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c index 56ae23c7d90..d974af52e1d 100644 --- a/sched/sched/sched_waitpid.c +++ b/sched/sched/sched_waitpid.c @@ -298,7 +298,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options) bool retains; #endif FAR struct siginfo info; - sigset_t sigset; + sigset_t set; int err; int ret; @@ -316,8 +316,8 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options) /* Create a signal set that contains only SIGCHLD */ - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, SIGCHLD); + (void)sigemptyset(&set); + (void)sigaddset(&set, SIGCHLD); /* Disable pre-emption so that nothing changes while the loop executes */ @@ -498,7 +498,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options) /* Wait for any death-of-child signal */ - ret = sigwaitinfo(&sigset, &info); + ret = sigwaitinfo(&set, &info); if (ret < 0) { goto errout_with_lock;