nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove casting of void pointers when handling signals.

Browse Source
This commit is contained in:
cypherpunks 2015-07-02 09:43:20 +02:00 committed by Nick Mathewson
parent f4b03f936e
commit 2d3f88f6b9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/main.c
View File

@ -2227,7 +2227,8 @@ run_main_loop_until_done(void)
static void
signal_callback(int fd, short events, void *arg)
{
uintptr_t sig = (uintptr_t)arg;
const int *sigptr = arg;
const int sig = *sigptr;
(void)fd;
(void)events;
@ -2237,7 +2238,7 @@ signal_callback(int fd, short events, void *arg)
/** Do the work of acting on a signal received in <b>sig</b> */
void
process_signal(uintptr_t sig)
process_signal(int sig)
{
switch (sig)
{
@ -2482,9 +2483,10 @@ handle_signals(int is_parent)
static struct event *signal_events[16]; /* bigger than it has to be. */
if (is_parent) {
for (i = 0; signals[i] >= 0; ++i) {
signal_events[i] = tor_evsignal_new(
tor_libevent_get_base(), signals[i], signal_callback,
(void*)(uintptr_t)signals[i]);
signal_events[i] = tor_evsignal_new(tor_libevent_get_base(), signals[i],
signal_callback,
/* Cast away const */
(int*)&signals[i]);
if (event_add(signal_events[i], NULL))
log_warn(LD_BUG, "Error from libevent when adding event for signal %d",
signals[i]);

2
src/or/main.h
View File

@ -60,7 +60,7 @@ MOCK_DECL(long,get_uptime,(void));
unsigned get_signewnym_epoch(void);
void handle_signals(int is_parent);
void process_signal(uintptr_t sig);
void process_signal(int sig);
int try_locking(const or_options_t *options, int err_if_locked);
int have_lockfile(void);