eloop: Remove global user data pointer
This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
This commit is contained in:
parent
9969e5a46a
commit
0456ea16d8
13 changed files with 37 additions and 93 deletions
|
@ -50,8 +50,6 @@ struct eloop_sock_table {
|
|||
};
|
||||
|
||||
struct eloop_data {
|
||||
void *user_data;
|
||||
|
||||
int max_sock;
|
||||
|
||||
struct eloop_sock_table readers;
|
||||
|
@ -81,10 +79,9 @@ static void eloop_sigsegv_handler(int sig)
|
|||
#endif /* WPA_TRACE */
|
||||
|
||||
|
||||
int eloop_init(void *user_data)
|
||||
int eloop_init(void)
|
||||
{
|
||||
os_memset(&eloop, 0, sizeof(eloop));
|
||||
eloop.user_data = user_data;
|
||||
#ifdef WPA_TRACE
|
||||
signal(SIGSEGV, eloop_sigsegv_handler);
|
||||
#endif /* WPA_TRACE */
|
||||
|
@ -408,7 +405,6 @@ static void eloop_process_pending_signals(void)
|
|||
if (eloop.signals[i].signaled) {
|
||||
eloop.signals[i].signaled = 0;
|
||||
eloop.signals[i].handler(eloop.signals[i].sig,
|
||||
eloop.user_data,
|
||||
eloop.signals[i].user_data);
|
||||
}
|
||||
}
|
||||
|
@ -588,9 +584,3 @@ void eloop_wait_for_read_sock(int sock)
|
|||
FD_SET(sock, &rfds);
|
||||
select(sock + 1, &rfds, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
|
||||
void * eloop_get_user_data(void)
|
||||
{
|
||||
return eloop.user_data;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue