From nobody Thu May 23 00:58:07 2024 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 4Vl8t81q6jz5LNng; Thu, 23 May 2024 00:58:08 +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 4Vl8t800nNz4lly; Thu, 23 May 2024 00:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716425888; 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=ABWSO0OgC0lDAwMufVM9vU2Y1e08XOAZHFLNAmhFz4c=; b=dqu73Ai2wuh1idmyYc93WSVy9eMJQCxzoEqCi6OzJtOP5zMzisZmNL/2SjwO/rc/lC5ZXj 9cDsxwThJthCn91vZlN/SnBWBdEs+MioCgijPRTc9V5+fLZu7Y9//0xGfR2BijsDZlxg/o T9KhUbdrxrJ0sBJnkis35oBhhcdytHa0B/ndwtRN4rAgDLVAzbx2RKUHtg7jRVUeHOK8+U z3Wpsn2OfyxBE3FBW8opRJCHDxnDygOonCWAV366Ox5Gq+dAb5wW45YR00dcO4I6eIERZ8 PjFCRuowD2X38DtgxmeKNCBANqGV4/P1MwSzyHlJIMep6y1EWcGkr0WdJQU7VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716425888; a=rsa-sha256; cv=none; b=t7BHrZjfN74tDge9RjzHrsRPt60Ct4J0geV71mRQ+U4HAX+mF2+8JGI3F0yeXennqXZyyQ 7c7PZLCx9DS/YU7Qa9N1W/ptsyzlLN4Kwo4zYXaE8GvAWbbbNPQbusUWJ986gzRcbahbBN VmLT+wZmRBgcEOE/6dBpjqehq7wkBi4lhyxfy/YNtLLhbTiIV6nk0wlHR0G1Hj6SEQbbCF CrWXuJleVUd+zLnDTIVzwDLK/NeDnoQEc82+Xg7Mm8D58KXR3+YY46OfJ8boYQYKu/ldWA ZrVAVS3BqhB4lB3bXxjJu2tGg2sMIieQxi80psALE0mGsu3fujUYlRCtF2GO8w== 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=1716425888; 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=ABWSO0OgC0lDAwMufVM9vU2Y1e08XOAZHFLNAmhFz4c=; b=YXrJPnicFH7Q2fcQbxq+tsRiYliYhI0hKU3CCWOS4wgw/ylU52epvDNuKKDFzuvh6QvGj1 OH1OviJj8lg0TFrNw/GGLVLajBZ6M9/BrY9W5AhvUlKZIqjBadnwrt6kefx1EuhWB9+K7/ Iq8Gxxn9NcZrv1DMddQTO9Ag9VbB8RvQy1yztR2g2nHfX0kqNzfzxOmf6elKFPXRzUbh4+ RlmtMX2q83H5+TPjebsv+T+rYmCfMCEKDk8DOZdvXq021pQC2+oFGuVS8l/5dmGY69FHp0 kJWKI28iTTBN9sly4eOMcA31oeW3kJFwlDKdWlSFC/pHVAbEfgo3+Uee5F1exA== 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 4Vl8t76kXszSYg; Thu, 23 May 2024 00:58:07 +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 44N0w7U2071949; Thu, 23 May 2024 00:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N0w70Q071946; Thu, 23 May 2024 00:58:07 GMT (envelope-from git) Date: Thu, 23 May 2024 00:58:07 GMT Message-Id: <202405230058.44N0w70Q071946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0e80798518be - main - mixer(8): Ignore mixer_open() failures for the -a option 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0e80798518be673bdad7245b627cb5bd7ec08888 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0e80798518be673bdad7245b627cb5bd7ec08888 commit 0e80798518be673bdad7245b627cb5bd7ec08888 Author: Christos Margiolis AuthorDate: 2024-05-23 00:57:25 +0000 Commit: Christos Margiolis CommitDate: 2024-05-23 00:57:25 +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 --- 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);