OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Eliminate `sigset' shadow warning 

Signed-off-by: Anton D. Kachalov <mouse@yandex-team.ru>
This commit is contained in:
Anton D. Kachalov 2015-08-03 15:31:42 +03:00
parent a07ed262b4
commit 577bae0a13
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sched/sched/sched_waitid.c
View File

@ -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;

8
sched/sched/sched_waitpid.c
View File

@ -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;