mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-07 13:28:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

hurd: Add prototype for and thus fix _hurdsig_abort_rpcs call

Browse Source 
This was actually not a problem since NULL was getting passed.
This commit is contained in:
Samuel Thibault 2023-08-15 22:41:23 +02:00
parent 8c4e46337f
commit 9736920963
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hurd/hurd/signal.h
View File

@ -28,6 +28,7 @@
#include <mach/mach_types.h> #include <mach/mach_types.h>
#include <mach/port.h> #include <mach/port.h>
#include <mach/message.h> #include <mach/message.h>
#include <thread_state.h>
#include <hurd/hurd_types.h> #include <hurd/hurd_types.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
@ -183,6 +184,11 @@ _hurd_self_sigstate (void)
} }
# endif # endif
#endif #endif
extern mach_port_t
_hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo, int sigthread,
struct machine_thread_all_state *state, int *state_change,
void (*reply) (void));
/* Thread listening on our message port; also called the "signal thread". */ /* Thread listening on our message port; also called the "signal thread". */

11
hurd/thread-cancel.c
View File

@ -22,15 +22,6 @@
#include <thread_state.h> #include <thread_state.h>
/* See hurdsig.c. */
extern mach_port_t _hurdsig_abort_rpcs (struct hurd_sigstate *ss,
int signo, int sigthread,
struct machine_thread_all_state *,
int *state_change,
mach_port_t *reply_port,
mach_msg_type_name_t reply_port_type,
int untraced);
error_t error_t
hurd_thread_cancel (thread_t thread) hurd_thread_cancel (thread_t thread)
{ {
@ -64,7 +55,7 @@ hurd_thread_cancel (thread_t thread)
/* Interrupt any interruptible RPC now in progress. */ /* Interrupt any interruptible RPC now in progress. */
state.set = 0; state.set = 0;
_hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL, 0, 0); _hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL);
if (state_change) if (state_change)
err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR,
(natural_t *) &state.basic, (natural_t *) &state.basic,