From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 2144F3858C78; Tue, 15 Aug 2023 20:52:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2144F3858C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692132766; bh=qDkCWGdZwshJVsYcKKKrMo3gz5bLVYqj1gCmW8l6KJc=; h=From:To:Subject:Date:From; b=rpdGdDMLEMximSPb4eWPqwKx0qOe5VEX8DYPQ4NDGRBMmoObo4y2DffW5V4IKywIr L09CRw4WToxJUYNE7YiLDipsF7f+u1QREVBiwm6ZNPpam4gkV7+dE9fN/Lubi4bguV zPsFb0M1gtv9V/h2NBwacERX9eG0Z4cJMVHfRx74= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Add prototype for and thus fix _hurdsig_abort_rpcs call X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 8c4e46337f2ef324f5af9863a962f070fd796cc1 X-Git-Newrev: 9736920963258a90c69e60fb8896ce3e70d18d3e Message-Id: <20230815205246.2144F3858C78@sourceware.org> Date: Tue, 15 Aug 2023 20:52:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9736920963258a90c69e60fb8896ce3e70d18d3e commit 9736920963258a90c69e60fb8896ce3e70d18d3e Author: Samuel Thibault 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 #include #include +#include #include #include #include @@ -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)); /* 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 -/* 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,