public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Add prototype for and thus fix _hurdsig_abort_rpcs call Date: Tue, 15 Aug 2023 20:52:46 +0000 (GMT) [thread overview] Message-ID: <20230815205246.2144F3858C78@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9736920963258a90c69e60fb8896ce3e70d18d3e commit 9736920963258a90c69e60fb8896ce3e70d18d3e Author: Samuel Thibault <samuel.thibault@ens-lyon.org> Date: Tue Aug 15 22:41:23 2023 +0200 hurd: Add prototype for and thus fix _hurdsig_abort_rpcs call This was actually not a problem since NULL was getting passed. Diff: --- hurd/hurd/signal.h | 6 ++++++ hurd/thread-cancel.c | 11 +---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 96b6fae007..290c455ad4 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -28,6 +28,7 @@ #include <mach/mach_types.h> #include <mach/port.h> #include <mach/message.h> +#include <thread_state.h> #include <hurd/hurd_types.h> #include <signal.h> #include <errno.h> @@ -183,6 +184,11 @@ _hurd_self_sigstate (void) } # 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)); \f /* Thread listening on our message port; also called the "signal thread". */ diff --git a/hurd/thread-cancel.c b/hurd/thread-cancel.c index b648046c3d..669d92c606 100644 --- a/hurd/thread-cancel.c +++ b/hurd/thread-cancel.c @@ -22,15 +22,6 @@ #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 hurd_thread_cancel (thread_t thread) { @@ -64,7 +55,7 @@ hurd_thread_cancel (thread_t thread) /* Interrupt any interruptible RPC now in progress. */ 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) err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (natural_t *) &state.basic,
reply other threads:[~2023-08-15 20:52 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230815205246.2144F3858C78@sourceware.org \ --to=sthibaul@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).