diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c index 3fb4a2b23..5d02cc9c0 100644 --- a/examples/ajoystick/ajoy_main.c +++ b/examples/ajoystick/ajoy_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examplex/ajoystick/ajoy_main.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -196,16 +196,16 @@ static void show_joystick(FAR const struct ajoy_sample_s *sample) static int ajoy_wait(int fd, FAR const struct timespec *timeout) { - sigset_t sigset; + sigset_t set; struct siginfo value; ajoy_buttonset_t newset; int ret; /* Wait for a signal */ - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, CONFIG_EXAMPLES_AJOYSTICK_SIGNO); - ret = sigtimedwait(&sigset, &value, timeout); + (void)sigemptyset(&set); + (void)sigaddset(&set, CONFIG_EXAMPLES_AJOYSTICK_SIGNO); + ret = sigtimedwait(&set, &value, timeout); if (ret < 0) { int errcode = errno; diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c index 7a7a74d51..8d33963bf 100644 --- a/examples/djoystick/djoy_main.c +++ b/examples/djoystick/djoy_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examplex/djoystick/djoy_main.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -204,15 +204,15 @@ int djoy_main(int argc, char *argv[]) #endif { struct siginfo value; - sigset_t sigset; + sigset_t set; djoy_buttonset_t newset; ssize_t nread; /* Wait for a signal */ - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, CONFIG_EXAMPLES_DJOYSTICK_SIGNO); - ret = sigwaitinfo(&sigset, &value); + (void)sigemptyset(&set); + (void)sigaddset(&set, CONFIG_EXAMPLES_DJOYSTICK_SIGNO); + ret = sigwaitinfo(&set, &value); if (ret < 0) { fprintf(stderr, "ERROR: sigwaitinfo() failed: %d\n", errno); diff --git a/examples/ostest/posixtimer.c b/examples/ostest/posixtimer.c index ebb1ab79e..c836b272c 100644 --- a/examples/ostest/posixtimer.c +++ b/examples/ostest/posixtimer.c @@ -140,7 +140,7 @@ static void timer_expiration(int signo, siginfo_t *info, void *ucontext) void timer_test(void) { - sigset_t sigset; + sigset_t set; struct sigaction act; struct sigaction oact; struct sigevent notify; @@ -156,9 +156,9 @@ void timer_test(void) printf("timer_test: Unmasking signal %d\n" , MY_TIMER_SIGNAL); - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, MY_TIMER_SIGNAL); - status = sigprocmask(SIG_UNBLOCK, &sigset, NULL); + (void)sigemptyset(&set); + (void)sigaddset(&set, MY_TIMER_SIGNAL); + status = sigprocmask(SIG_UNBLOCK, &set, NULL); if (status != OK) { printf("timer_test: ERROR sigprocmask failed, status=%d\n", diff --git a/examples/ostest/sighand.c b/examples/ostest/sighand.c index e4e5bf639..cacfb6072 100644 --- a/examples/ostest/sighand.c +++ b/examples/ostest/sighand.c @@ -151,7 +151,7 @@ static void wakeup_action(int signo, siginfo_t *info, void *ucontext) static int waiter_main(int argc, char *argv[]) { - sigset_t sigset; + sigset_t set; struct sigaction act; struct sigaction oact; int status; @@ -159,9 +159,9 @@ static int waiter_main(int argc, char *argv[]) printf("waiter_main: Waiter started\n" ); printf("waiter_main: Unmasking signal %d\n" , WAKEUP_SIGNAL); - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, WAKEUP_SIGNAL); - status = sigprocmask(SIG_UNBLOCK, &sigset, NULL); + (void)sigemptyset(&set); + (void)sigaddset(&set, WAKEUP_SIGNAL); + status = sigprocmask(SIG_UNBLOCK, &set, NULL); if (status != OK) { printf("waiter_main: ERROR sigprocmask failed, status=%d\n", @@ -230,7 +230,7 @@ void sighand_test(void) #ifdef CONFIG_SCHED_HAVE_PARENT struct sigaction act; struct sigaction oact; - sigset_t sigset; + sigset_t set; #endif struct sched_param param; union sigval sigvalue; @@ -243,9 +243,9 @@ void sighand_test(void) #ifdef CONFIG_SCHED_HAVE_PARENT printf("sighand_test: Unmasking SIGCHLD\n"); - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, SIGCHLD); - status = sigprocmask(SIG_UNBLOCK, &sigset, NULL); + (void)sigemptyset(&set); + (void)sigaddset(&set, SIGCHLD); + status = sigprocmask(SIG_UNBLOCK, &set, NULL); if (status != OK) { printf("sighand_test: ERROR sigprocmask failed, status=%d\n", diff --git a/examples/ostest/signest.c b/examples/ostest/signest.c index 61792fdab..aaa628226 100644 --- a/examples/ostest/signest.c +++ b/examples/ostest/signest.c @@ -107,7 +107,7 @@ static void waiter_action(int signo) static int waiter_main(int argc, char *argv[]) { - sigset_t sigset; + sigset_t set; struct sigaction act; int ret; int i; @@ -115,8 +115,8 @@ static int waiter_main(int argc, char *argv[]) printf("waiter_main: Waiter started\n" ); printf("waiter_main: Setting signal mask\n" ); - (void)sigemptyset(&sigset); - ret = sigprocmask(SIG_SETMASK, &sigset, NULL); + (void)sigemptyset(&set); + ret = sigprocmask(SIG_SETMASK, &set, NULL); if (ret < 0) { printf("waiter_main: ERROR sigprocmask failed: %d\n", errno); diff --git a/graphics/traveler/src/trv_input.c b/graphics/traveler/src/trv_input.c index 15b41ad4f..e9d071828 100644 --- a/graphics/traveler/src/trv_input.c +++ b/graphics/traveler/src/trv_input.c @@ -145,15 +145,15 @@ static struct trv_joystick_s g_trv_joystick; #ifdef CONFIG_GRAPHICS_TRAVELER_AJOYSTICK static int trv_joystick_wait(void) { - sigset_t sigset; + sigset_t set; struct siginfo value; int ret; /* Wait for a signal */ - (void)sigemptyset(&sigset); - (void)sigaddset(&sigset, CONFIG_GRAPHICS_TRAVELER_JOYSTICK_SIGNO); - ret = sigwaitinfo(&sigset, &value); + (void)sigemptyset(&set); + (void)sigaddset(&set, CONFIG_GRAPHICS_TRAVELER_JOYSTICK_SIGNO); + ret = sigwaitinfo(&set, &value); if (ret < 0) { int errcode = errno;