From nobody Sat Sep 05 18:26:46 2026 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 4hchck5LlPz6qwGS for ; Sat, 05 Sep 2026 18:26:46 +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 4hchck2f0Bz3SvH for ; Sat, 05 Sep 2026 18:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788632806; 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=1aDeUrtaoh4UvwFb5pqQNuxtdVhi3zoGXPOnVtVkPHM=; b=I9PavcQazMkkhoeUvDxDyzUftmowvXJ0SRWBKcuBqm2BQafJ9FMY1AkX6pWQtkrfZXqFUJ RfbRv90mL5I0GlEKFKs3g1wZZGPNoUBgfSP1aGRR3Pv/DpwM6TyyQ5LBq9mswTR8bie644 G4lxA0WoG7ow9TDmwK9ytEH+BFcerFSeN44bKPcznLCvPJCkM4/3wwzuxamdeXO8Rz6yXQ c/SnHRvSmTY3Z1O9ISWoUf1HhukKwefbbyVyuhLZfLLhKIdb97ETrgaHW2vQ7i+chRyBB8 pvXB3HzzcomMSD1tP3FAQdBJbBcSNWtShSuClCBDdw8Sx9GX0mjyMKLDYeOywQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788632806; a=rsa-sha256; cv=none; b=rJMqnEdjcS3g6Dg+eGXJdSu5TpCyXLwMHq22rbohKH1CHg+bC20zJLTmuWz9qjq/an+P8m TLBUVhOJG+oHnjqJJfqR5kcEDIgRvgYq+JwVMwd9moO1NMbY+vqdmmCXLFcfRCFGgxHMUg NyX0PNwjqexfMYiiYX4VrZ28RA0xEY8T6+e1YYOQbDB5nS7D+RoZ3B3GUBjCkdtXdnsuGC IkHbE41XqAivK4Zw/1wIHUzqgndGeRfHXr+WLDFcL0k5BQh5mR8ilKNP92mMOCqt9rWl74 cCxTHPVjXbtR9GLbu7rjfSURV6lyHBdOAIDuEeTO+K24T+xq5X0WhsTitoHcuw== 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=1788632806; 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=1aDeUrtaoh4UvwFb5pqQNuxtdVhi3zoGXPOnVtVkPHM=; b=y16plkFv0T3PQYZOwo15d+EuflxvZISHIhWYW2GY4Uw+SuZeUTkYznlQJPLPYsLs9rMGJL rNKiYcVsVDr0VgQY32oOuH816tOFuq1d7PUaWzwfsleLco/oCPuB1ul4Bs2uvVX4bzqh+K QPVtUkxAdDflFcYPfFfhdCdR4swi8QaMYKY/TKqBMHqKUblJiEMBxtJ11opFNtq2gSqZ8R 8pZmSVbjQ4cP/hPE/C3nK1yr2DCmAkPWnOzfHy3ZhtB1WrVr3SE0cyS3eCVWioV3YaddA1 RYCD5XZXZsJPqw62gJ+fWdncBxYEAJ2wStE/DqgzsuLsWvBqwLEr64wcoF9qYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hchck0xqlzwyX for ; Sat, 05 Sep 2026 18:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 18:26:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Fernando Apeste=?utf-8?Q?gu=C3=ADa?= Subject: git: e8c1931941cb - stable/15 - mixer: Improve error messages 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e8c1931941cb57a7ea07bfc53b0a52f491be4b22 Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 18:26:46 +0000 Message-Id: <6a9c5ee6.21f15.69640f6d@gitrepo.freebsd.org> The branch stable/15 has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=e8c1931941cb57a7ea07bfc53b0a52f491be4b22 commit e8c1931941cb57a7ea07bfc53b0a52f491be4b22 Author: Fernando Apesteguía AuthorDate: 2026-05-06 10:03:15 +0000 Commit: Fernando Apesteguía CommitDate: 2026-09-05 18:26:09 +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 (cherry picked from commit 9f5cfe625e9e8153599105458650e5fcecfd6281) --- 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);