From nobody Sat May 25 19:31:36 2024 X-Original-To: dev-commits-src-branches@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 4VmsV10nD9z5LSxr; Sat, 25 May 2024 19:31:37 +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 4VmsV03dsvz4jhK; Sat, 25 May 2024 19:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716665496; 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=foiaQ1gM5atx6NWyZ3Fv+dHJgEYVSndpWP/eM9go+Mk=; b=ULbJohLnlTqUiZ969nb4wg0qCTJsx1/qjwVCRLk2SO9yqaf6Ct5OasGJ9ulIq4iW5l0lxN ey/aDfxwiZ67b8ZmGY3a3UF8PzaIdS+jLngDI7yMndEnGsesfLWchYq5lTHjyZXzxcpySA +ldSxxJ554CcMlIHuKWBLGVRP5YffsPIz7gfQ9l077gVBla7VV0RkPkxpTVWUQlMAEUWsK EM0URr62qHUrQ+CeV3k5gArxHKAbY1OOMEXMy11Yuyn8S9k9jr2+AVtTBXHwKhTgtDz6Ry Q5NQ5YvlkLQCEN5GZ4TTM2LldIUUrlKQo+1VPyOM5bRBHI2RYo3M2ejZFUphqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716665496; a=rsa-sha256; cv=none; b=QRUvNXWprPioKGVQE9uuqoz0dJL4uFyCfaCvKPsPFObGfeaFUVPlyO892yiyTd45O6UyFT RP8KDwaxXx1wrirg+tJ9IPD5S9rOf+dV+TQNZ92Jek/PNWlLSnMVgQL8VC09Q7WAiKFews mPW0M/8ol+EzNXFb8og7Y0HWCerCKyx5Iqkj71hoS0aICTCYIpt+ZBzWI6eTsaDrxcPdQg JwIBO6lsy09MBysjmji9sbPkMOPTthmysA+IU7r5JoVFA+ylhtt9+EYnxnPeUFcBLyF2U7 f/2XlFvfrWolv8zZ89OFxPfdkoBIT+mYYba/KAfj0bLoEz5kyj0sfETu5pXbCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716665496; 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=foiaQ1gM5atx6NWyZ3Fv+dHJgEYVSndpWP/eM9go+Mk=; b=sMV3ItnSZcPjCvNndMrEqbi45pr10Cf6SgfvE3VtMJEW2V2FOoA48/tC1H/0wbTP/pZCPP 0OamXlCN4DAOBH87oR/ZR1M495s1EqSIqFJIIpjRsl3CQka4P1fQJ3RsPYZNT1+XcWWstu tEAycblAu4EmVp3Sp1QxhqkTzsBXYJM6HrtkWjVWsro8W+SThGWNTGFgXdMlVUMyP+9sGQ NbeZArXzuWi4vbVZaReEocBnDXBIMm/UCQVWukcd1h1xw56LS8bpUWrdMglXPXi3guJa7n Z/KbW0wewlsosHvmsxktyaeTWavSCc6FDpsbaswJUXf2u5lL7O1h9KSWrrrB7Q== 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 4VmsV031XQzV9q; Sat, 25 May 2024 19:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44PJVafW043441; Sat, 25 May 2024 19:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44PJVam5043438; Sat, 25 May 2024 19:31:36 GMT (envelope-from git) Date: Sat, 25 May 2024 19:31:36 GMT Message-Id: <202405251931.44PJVam5043438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cd254b9243d3 - stable/14 - mixer(8): Ignore mixer_open() failures for the -a option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd254b9243d3d0f4d86b388f919dc744086fb002 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cd254b9243d3d0f4d86b388f919dc744086fb002 commit cd254b9243d3d0f4d86b388f919dc744086fb002 Author: Christos Margiolis AuthorDate: 2024-05-23 00:57:25 +0000 Commit: Christos Margiolis CommitDate: 2024-05-25 19:30:49 +0000 mixer(8): Ignore mixer_open() failures for the -a option The most likely reason mixer_open() will fail is because either the device doesn't exist, or because it is disabled, so there is not reason to kill the application. Instead, continue and print the rest of the enabled mixers. PR: 277615 Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45151 (cherry picked from commit 0e80798518be673bdad7245b627cb5bd7ec08888) --- usr.sbin/mixer/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 47d8e6359b73..284ea955b7b4 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -99,7 +99,7 @@ main(int argc, char *argv[]) for (i = 0; i < n; i++) { (void)snprintf(buf, sizeof(buf), "/dev/mixer%d", i); if ((m = mixer_open(buf)) == NULL) - errx(1, "%s: no such mixer", buf); + continue; initctls(m); if (sflag) printrecsrc(m, oflag);