From nobody Sun Aug 30 11:02:11 2026 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 4hXq2c6vrnz6qZdQ for ; Sun, 30 Aug 2026 11:02:16 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hXq2c6CyVz3xKD for ; Sun, 30 Aug 2026 11:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788087736; 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=/ZIFTZeM68/WX27/oL+JDucpLtcqKMvbklPGFPboJgk=; b=Q8ldvt5ZpA86URXy4iZ+eEIXqXgWL3K7IQ81pkxqPjBiyN7TUXKKxMIAYrXr/sZT//TuWx dACGHZZ1legp1LOjjldIQB3UdYezlN4NPoHtPh/NxUayurp8X9fC6IY9qBT0wzhgYe2zjy 8leq2AanmuRkGTmZYZr+6mDVvbLEeH3lXHI/NhvtGf9dnozR928e5BZJ4rnRhZI9hi0apJ 5yznaY3WJFHffNKNsOgDVWSMeF+gKTRV1jHd4dF4/lpgs+uNL5pHos2ILlfLojduym5MgD IEv1YbWzv8U74FIcYssGpHKssAiPYKjIh8y1nYvWedvqNM4b+rDms+/mzxz4Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788087736; a=rsa-sha256; cv=none; b=wvQj1LioywRgkqmMWMzqHqzX2qr9GVYr7AgHKLdCW9BWZtbdwTufBaA+vZw/Il9xqevyF3 sycYfSg2ykec98fPrxcsifP/sGBB2NQuW24AzyfxjvfVMIldOUPdegdqsFaeMnze+lSD36 HNvPc6J8y0yRrdDH3Zz1EXPBf7bSyp1h50kMjqDVhFSf4CDsFvZP//QAm0J7iuEVb+bCYu +zvwOP2/tSnIYRU0VlAW5+W2AiEU1V6UyXWQSTVIMXtgJ8MgpXy9DyprfzY7hE/F5pkMu0 HDmxLXHBkdCO505+qOuK17v73eZA/XDJO4DAEGwcWezKgzfoOIkQiOSxnURqfw== 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=1788087736; 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=/ZIFTZeM68/WX27/oL+JDucpLtcqKMvbklPGFPboJgk=; b=rpnBJPacSKUn5N+NzDHuHPfOKH6r1YBN3xkUy48XZQ/rJZNnTSecudos8kpx3lXxI+XVLw LcvrFh+nvlgf0CyGPbBLl3PedttVaJW1JDwkNTu6XDPv7cEW6oalx7UbNMjndS0O5/ABDj 6Z6ksFDOJRaSGLpMd23HwM8feN9oT71646j9eha3RalUVvh2yPKSDWhwgpqz9CDt3zKJ4m VyU5+yAJ38Al3YNLRlHG9M4Bn7P/9SnB3fJB6IZDuVSRdUaasrxzWyUbkWJ0E6C8dVQZ4/ dtzNTZYQ4+tdXSjjiFnRdtPm3tFLGrWAUMaz3WagAhGJTm2NiVRNqnLzEsy8cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXq2c5Jqrz75H for ; Sun, 30 Aug 2026 11:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 236f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Aug 2026 11:02:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando Apeste=?utf-8?Q?gu=C3=ADa?= Subject: git: 9f5cfe625e9e - main - mixer: Improve error messages 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f5cfe625e9e8153599105458650e5fcecfd6281 Auto-Submitted: auto-generated Date: Sun, 30 Aug 2026 11:02:11 +0000 Message-Id: <6a940db3.236f5.7440fd9@gitrepo.freebsd.org> The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=9f5cfe625e9e8153599105458650e5fcecfd6281 commit 9f5cfe625e9e8153599105458650e5fcecfd6281 Author: Fernando Apesteguía AuthorDate: 2026-05-06 10:03:15 +0000 Commit: Fernando Apesteguía CommitDate: 2026-08-30 11:01:50 +0000 mixer: Improve error messages Use better diagnostic messages when unit numbers are wrong. Reviewed by: arrowd@, christos@, kevans@ Approved by: christos@ Differential Revision: https://reviews.freebsd.org/D56845 --- usr.sbin/mixer/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index e8c36d0c8bf7..88a65934d888 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -71,7 +71,7 @@ main(int argc, char *argv[]) errno = 0; dunit = strtol(optarg, NULL, 10); if (errno == EINVAL || errno == ERANGE) - err(1, "strtol(%s)", optarg); + err(1, "%s", strlen(optarg) ? optarg : "pcm"); dflag = 1; break; case 'f': @@ -328,6 +328,8 @@ set_dunit(struct mixer *m, int dunit) { int n; + if (dunit > mixer_get_nmixers()) + errx(1, "No such mixer unit: %d", dunit); if ((n = mixer_get_dunit()) < 0) { warn("cannot get default unit"); return (-1);