Skip to content

Commit b503be2

Browse files
committed
kernel: poll: rename reserved 'signal' symbol
This symbol is reserved and usage of reserved symbols violates the coding guidelines. (MISRA 21.2) NAME signal - ANSI C signal handling SYNOPSIS #include <signal.h> sighandler_t signal(int signum, sighandler_t handler); Signed-off-by: Anas Nashif <[email protected]>
1 parent 52775ff commit b503be2

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

include/kernel.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5313,36 +5313,36 @@ __syscall int k_poll(struct k_poll_event *events, int num_events,
53135313
*
53145314
* Ready a poll signal object to be signaled via k_poll_signal_raise().
53155315
*
5316-
* @param signal A poll signal.
5316+
* @param sig A poll signal.
53175317
*
53185318
* @return N/A
53195319
*/
53205320

5321-
__syscall void k_poll_signal_init(struct k_poll_signal *signal);
5321+
__syscall void k_poll_signal_init(struct k_poll_signal *sig);
53225322

53235323
/*
53245324
* @brief Reset a poll signal object's state to unsignaled.
53255325
*
5326-
* @param signal A poll signal object
5326+
* @param sig A poll signal object
53275327
*/
5328-
__syscall void k_poll_signal_reset(struct k_poll_signal *signal);
5328+
__syscall void k_poll_signal_reset(struct k_poll_signal *sig);
53295329

5330-
static inline void z_impl_k_poll_signal_reset(struct k_poll_signal *signal)
5330+
static inline void z_impl_k_poll_signal_reset(struct k_poll_signal *sig)
53315331
{
5332-
signal->signaled = 0U;
5332+
sig->signaled = 0U;
53335333
}
53345334

53355335
/**
53365336
* @brief Fetch the signaled state and result value of a poll signal
53375337
*
5338-
* @param signal A poll signal object
5338+
* @param sig A poll signal object
53395339
* @param signaled An integer buffer which will be written nonzero if the
53405340
* object was signaled
53415341
* @param result An integer destination buffer which will be written with the
53425342
* result value if the object was signaled, or an undefined
53435343
* value if it was not.
53445344
*/
5345-
__syscall void k_poll_signal_check(struct k_poll_signal *signal,
5345+
__syscall void k_poll_signal_check(struct k_poll_signal *sig,
53465346
unsigned int *signaled, int *result);
53475347

53485348
/**
@@ -5362,14 +5362,14 @@ __syscall void k_poll_signal_check(struct k_poll_signal *signal,
53625362
* this function returns an error indicating that an expiring poll was
53635363
* not notified. The next k_poll() will detect the missed raise.
53645364
*
5365-
* @param signal A poll signal.
5365+
* @param sig A poll signal.
53665366
* @param result The value to store in the result field of the signal.
53675367
*
53685368
* @retval 0 The signal was delivered successfully.
53695369
* @retval -EAGAIN The polling thread's timeout is in the process of expiring.
53705370
*/
53715371

5372-
__syscall int k_poll_signal_raise(struct k_poll_signal *signal, int result);
5372+
__syscall int k_poll_signal_raise(struct k_poll_signal *sig, int result);
53735373

53745374
/**
53755375
* @internal

kernel/poll.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -415,51 +415,51 @@ void z_handle_obj_poll_events(sys_dlist_t *events, uint32_t state)
415415
}
416416
}
417417

418-
void z_impl_k_poll_signal_init(struct k_poll_signal *signal)
418+
void z_impl_k_poll_signal_init(struct k_poll_signal *sig)
419419
{
420-
sys_dlist_init(&signal->poll_events);
421-
signal->signaled = 0U;
422-
/* signal->result is left unitialized */
423-
z_object_init(signal);
420+
sys_dlist_init(&sig->poll_events);
421+
sig->signaled = 0U;
422+
/* sig->result is left unitialized */
423+
z_object_init(sig);
424424
}
425425

426426
#ifdef CONFIG_USERSPACE
427-
static inline void z_vrfy_k_poll_signal_init(struct k_poll_signal *signal)
427+
static inline void z_vrfy_k_poll_signal_init(struct k_poll_signal *sig)
428428
{
429-
Z_OOPS(Z_SYSCALL_OBJ_INIT(signal, K_OBJ_POLL_SIGNAL));
430-
z_impl_k_poll_signal_init(signal);
429+
Z_OOPS(Z_SYSCALL_OBJ_INIT(sig, K_OBJ_POLL_SIGNAL));
430+
z_impl_k_poll_signal_init(sig);
431431
}
432432
#include <syscalls/k_poll_signal_init_mrsh.c>
433433
#endif
434434

435-
void z_impl_k_poll_signal_check(struct k_poll_signal *signal,
435+
void z_impl_k_poll_signal_check(struct k_poll_signal *sig,
436436
unsigned int *signaled, int *result)
437437
{
438-
*signaled = signal->signaled;
439-
*result = signal->result;
438+
*signaled = sig->signaled;
439+
*result = sig->result;
440440
}
441441

442442
#ifdef CONFIG_USERSPACE
443-
void z_vrfy_k_poll_signal_check(struct k_poll_signal *signal,
443+
void z_vrfy_k_poll_signal_check(struct k_poll_signal *sig,
444444
unsigned int *signaled, int *result)
445445
{
446-
Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL));
446+
Z_OOPS(Z_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
447447
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(signaled, sizeof(unsigned int)));
448448
Z_OOPS(Z_SYSCALL_MEMORY_WRITE(result, sizeof(int)));
449-
z_impl_k_poll_signal_check(signal, signaled, result);
449+
z_impl_k_poll_signal_check(sig, signaled, result);
450450
}
451451
#include <syscalls/k_poll_signal_check_mrsh.c>
452452
#endif
453453

454-
int z_impl_k_poll_signal_raise(struct k_poll_signal *signal, int result)
454+
int z_impl_k_poll_signal_raise(struct k_poll_signal *sig, int result)
455455
{
456456
k_spinlock_key_t key = k_spin_lock(&lock);
457457
struct k_poll_event *poll_event;
458458

459-
signal->result = result;
460-
signal->signaled = 1U;
459+
sig->result = result;
460+
sig->signaled = 1U;
461461

462-
poll_event = (struct k_poll_event *)sys_dlist_get(&signal->poll_events);
462+
poll_event = (struct k_poll_event *)sys_dlist_get(&sig->poll_events);
463463
if (poll_event == NULL) {
464464
k_spin_unlock(&lock, key);
465465
return 0;
@@ -472,18 +472,18 @@ int z_impl_k_poll_signal_raise(struct k_poll_signal *signal, int result)
472472
}
473473

474474
#ifdef CONFIG_USERSPACE
475-
static inline int z_vrfy_k_poll_signal_raise(struct k_poll_signal *signal,
475+
static inline int z_vrfy_k_poll_signal_raise(struct k_poll_signal *sig,
476476
int result)
477477
{
478-
Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL));
479-
return z_impl_k_poll_signal_raise(signal, result);
478+
Z_OOPS(Z_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
479+
return z_impl_k_poll_signal_raise(sig, result);
480480
}
481481
#include <syscalls/k_poll_signal_raise_mrsh.c>
482482

483-
static inline void z_vrfy_k_poll_signal_reset(struct k_poll_signal *signal)
483+
static inline void z_vrfy_k_poll_signal_reset(struct k_poll_signal *sig)
484484
{
485-
Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL));
486-
z_impl_k_poll_signal_reset(signal);
485+
Z_OOPS(Z_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
486+
z_impl_k_poll_signal_reset(sig);
487487
}
488488
#include <syscalls/k_poll_signal_reset_mrsh.c>
489489

0 commit comments

Comments
 (0)