From nobody Wed Dec 14 22:39:39 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 4NXVfh1ps1z4klGS; Wed, 14 Dec 2022 22:39:40 +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 4NXVfh1GSYz4Kly; Wed, 14 Dec 2022 22:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671057580; 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=hIzLAfTaPMB6GmpnkI1X6FqjTmyZbRCpRZeEECMZeWo=; b=j620JGFMcT+ZEPCKcznmlno9pzTb8A7FtI/xMR3CT8eFWKqbJ4yPcgqJU9ZJ1FgO5rpuWO Nxrotv5q9POb62pA5ldtZxN9qn7iGqj4wBPJ5HsS64z8chnb4ZWTlJql00UjSCBylcKMZT 3Xqn1wdTbDWW46bKo27tsZya5j3IAH8VDAEkoI/NL2xaxfsXd0FlCch0l/pdpyThM/gONo prMYgSAju/kUJhqs+zWSUB+FlLfzbbmCeX2/Z2SZvT+silnnd/ZUZBX/ucZrpAaLIBv76v caMZ0n6Zlgwb5oe2OrVYFFH7OEor7dJtwEXGp9KGx6mVn/vPfMJSQPHxuFu27w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671057580; 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=hIzLAfTaPMB6GmpnkI1X6FqjTmyZbRCpRZeEECMZeWo=; b=dDqYU2PL2RkrAj66HKxJZ8RVNe8SdKd93IxLP3uY9pYCe4rGG124RfnIGOXCAASgnLtfpy VNjTvWO+ZRsgqqFValzlf73NJH0pNFuwa08GHxs8eGIvyfGe8L9O5sUnjuA+TJCgcgZI00 ri0hBpccsFS+ASS7rdGDFcUuZC4rnSiHwxe11w9FVSsYX7lfotVizyXpvjrODd5n50flYA tOzUQyMjeyCFuYAshVMQfjztR14Uv+ZSNgIAYoDvKaCKopxuGH2Ct8/wPvTaKhrTLI4KzM o45trKxNcj6vFI5pHOw0Fg+Qa38Wo054EwDpwDuBUHcK9oL4YIAYteob+kAPcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671057580; a=rsa-sha256; cv=none; b=lHI/ramWv+BfUS36PcutVXpiWARMMkjrUVDQD8NsWbkyn82xHsBcDtLYnRtO8et99DSS2r 90BuiqZ+/MajKkyM3oCw+U6rVacSRTzr1CQ3xhNISo759KhIalbpH9277X6mBeEi+B7L5K qK4aX3vXtMVDj4yHrb2XXDekCWfKZNJtAVM+YLdFb2LI5caPtDQAlkXqEUIEwNxYooYpTH 7isymlBhiOaF7kqHNCJCHMu6cFNgP239ptHcuo0rDsOvyUEB9bBevFH6O7REgUExdakAXa zK0Demt3aFKjIiE7Gk8bVEXdD7GaF4XN0n1zhP7ZHg8oizF4r/vghIUXxofDQg== 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 4NXVfh0HvYz19LP; Wed, 14 Dec 2022 22:39:40 +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 2BEMdd7B081003; Wed, 14 Dec 2022 22:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BEMddHn081002; Wed, 14 Dec 2022 22:39:39 GMT (envelope-from git) Date: Wed, 14 Dec 2022 22:39:39 GMT Message-Id: <202212142239.2BEMddHn081002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: ac4e3a27ab49 - main - Unbreak the build when MAC is not defined 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac4e3a27ab499d3401e8810c6a11713e6ed6f76b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4e3a27ab499d3401e8810c6a11713e6ed6f76b commit ac4e3a27ab499d3401e8810c6a11713e6ed6f76b Author: Andrew Gallatin AuthorDate: 2022-12-14 22:33:30 +0000 Commit: Andrew Gallatin CommitDate: 2022-12-14 22:39:25 +0000 Unbreak the build when MAC is not defined 7a2c93b86ef7 removed the use of "error" when MAC was not defined, resulting in an unused variable error. Sponsored by: Netflix Reviewed by: jhb --- sys/kern/sys_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 5cfb366c150b..2ad76b15cee6 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -145,7 +145,8 @@ soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred, if (error) return (error); #endif - return (sousrsend(so, NULL, uio, NULL, 0, NULL)); + error = sousrsend(so, NULL, uio, NULL, 0, NULL); + return (error); } static int