git: 9f5cfe625e9e - main - mixer: Improve error messages

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Sun, 30 Aug 2026 11:02:11 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/src/commit/?id=9f5cfe625e9e8153599105458650e5fcecfd6281

commit 9f5cfe625e9e8153599105458650e5fcecfd6281
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2026-05-06 10:03:15 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
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);