From nobody Tue Apr 19 12:46:09 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B204B11CF07D; Tue, 19 Apr 2022 12:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjNpB3MVyz4SwB; Tue, 19 Apr 2022 12:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650372370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMMCpKMbhS1yBa+uLt7tzDb49Prw3n/ow3JE9DydKE4=; b=RKnBJQqW2AbJbLXjqnn9drC5kMNwYx6aiJfKfdSL662iOS/Ozsk+ZfKCPeu84WGa5kCAa6 d8AF6O2TPIsHOFIm+Fd2UgZwTNlUjCIdaKgfrGg/HKQq4E9WAaQp2IntM4fKHU5FPjFwve ai/OE3mza8Y7HMXNVXLQc7SRMZTDOb/R2zCCu7fdggxd7vVTI4S/wBNEJ7l3JOViTWjkZv C+YJrIA3EqG+wOLXxnoN4JJkB4ekV5Ull9XJwz7viVoFSOT1FyWBvqsJaOQDGID+u10qcU tgOMW+xDsf6ExorV7seJCZaWdHHkoEmgpj8paNbjQnrPgAmm27dfOr4wYvMasw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA12B2785A; Tue, 19 Apr 2022 12:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23JCk97m030502; Tue, 19 Apr 2022 12:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JCk9gZ030501; Tue, 19 Apr 2022 12:46:09 GMT (envelope-from git) Date: Tue, 19 Apr 2022 12:46:09 GMT Message-Id: <202204191246.23JCk9gZ030501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c5c981d4437b - main - signals: plug a set-but-not-used var List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5c981d4437b382c136cd7cc3d61abfea58f7d24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650372370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMMCpKMbhS1yBa+uLt7tzDb49Prw3n/ow3JE9DydKE4=; b=dTfYO1oogASC7rgq7dwQalD+8qNSVZcKNflfMe43wLezZk+urSKm8xZjzTJXUphjCZE4Qe E6ZgojlKTdAZXcSU0KB6HgL4kghSq2KfA3wATqEjs376N9kzUUpMeFCpTATmfHc7pzlFDy iDsvVFz0GwDEpf+wmQoc2wl/KdjHQKE8SgfHorzRl33MUvwn1TqzCDc8slrFWOHtkF1Npc idgmjE/jIkPszGkUbGHB2NxTgUEbA4bU69/4I7r3egBLBvQFKwkfad+hBfqcGkJqlO+r8W bygQcHh7aJaX4oLR2g6Of1pP61wwqRU6YFbpa6n6wsUGM9mkjf4rm/ExRtwJgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650372370; a=rsa-sha256; cv=none; b=nQuaZ9EP3ZxTqixlphRfzoj0chU0DoRJy/SlZOtZcUQjU1mCqlAppxwmebjKJfTISxbWHV wgq+NR7osyqtavfQ8ddeveDpWmZKaeVyJsQrW3pfbQzravAKtu7VW8uypRI0CI4KVn4qLc ZmMK01ZMLK5jnwL5NZtthayPXXTBgefvuRD6fTGFVYP7t7zxAKlNAz1G31YfcPasIZdsIN URMeCN80Chsmf5DtXXlcx5BRlTvZ+jYaNejDn4IEa74dovEoTxFPv37iruQPnYihgUXnWa 9fz19UGncDbw8ZQa0Eog4V4kMq9KzN0ewfZiqENGRPSst1K4gskMK4KVv7snFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c5c981d4437b382c136cd7cc3d61abfea58f7d24 commit c5c981d4437b382c136cd7cc3d61abfea58f7d24 Author: Mateusz Guzik AuthorDate: 2022-04-19 12:33:19 +0000 Commit: Mateusz Guzik CommitDate: 2022-04-19 12:45:57 +0000 signals: plug a set-but-not-used var Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_sig.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 1b6464a4a0cc..55b2957d163b 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2019,11 +2019,10 @@ trapsignal(struct thread *td, ksiginfo_t *ksi) struct sigacts *ps; struct proc *p; sigset_t sigmask; - int code, sig; + int sig; p = td->td_proc; sig = ksi->ksi_signo; - code = ksi->ksi_code; KASSERT(_SIG_VALID(sig), ("invalid signal")); sigfastblock_fetch(td); @@ -2038,7 +2037,7 @@ trapsignal(struct thread *td, ksiginfo_t *ksi) #ifdef KTRACE if (KTRPOINT(curthread, KTR_PSIG)) ktrpsig(sig, ps->ps_sigact[_SIG_IDX(sig)], - &td->td_sigmask, code); + &td->td_sigmask, ksi->ksi_code); #endif (*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)], ksi, &td->td_sigmask);