From nobody Mon Feb 12 11:00:19 2024 X-Original-To: dev-commits-src-main@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 4TYM1b3wXXz59ZSh; Mon, 12 Feb 2024 11:00:19 +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 4TYM1b3QNgz4VY4; Mon, 12 Feb 2024 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735619; 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=ZAlAlJeb2JQ/exs1zCcjDtd5kGZon1SuUjLiQOVI39M=; b=oHcW6ywqC2QelqxNwK7Iu8vphRDNwAwcow4H/CT4VM00fkkbcbSx/DzS4T2JfW8XDf6AMb yWMiWIZuxDd67Cl74Tgd84DzAB7Zi2hP0pAt11U9ya55G+6RJP7lhYWSg4gGBhfywE0ufT u8+d/t3ahqUFC/1DXfWeY7Br1vV2eStoZAi/HMqmN8vXpZbBNDG9MYDhxVxfS+SFIzULUS y+H8z7T9hcPNSPZ0HJhiZ2QeAwTsgWizuZy2nw8hB5QH5u2XoCZcnehYYVfNmyBlE+QlyB bJET611hv2VXhfamYcMP7Q65c43nWkgYKqclPj8UmRaCG5bAVUo/2D4ANkessw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735619; a=rsa-sha256; cv=none; b=HgrRt51vpKKk/LLuqGI5k9ArUMq8+nZEQwI9aFcse+gvv9orafGTLezo511R8P42CdCqku Jy2pDE/JMWBSeCkR7K71ZQBQbsPxcyA0pMZEs/HUG43gRujlPXDEZn7opnFtHKmTl4hbPq HaO1jzDlasOob6NOVPTDYcirVElWkfY9V1ArTeidSDqU6ZdK0S7ldVe+G4dK5arTiVD8um XyQu22+n9H0aDSt6f9jI0sRwm7o+dNzGzskwBuitg4DOwX7fZVmexoYnkxmbVa4U7dEINK AJpwVD8mwBbzc8HWJ029RmKnP++UOLQb0aRn+Ob7dfjIfdHRgQJ8wwMJpyv4og== 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=1707735619; 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=ZAlAlJeb2JQ/exs1zCcjDtd5kGZon1SuUjLiQOVI39M=; b=qbw1QipCQUp+79wsoBEtnFr0kG2djQS72sKkueACOc1txnuBU4lXLjPuMmS6m6+5rOlG61 sStw/ArlhniOfTJ0VsdPjCKkueC3LZqyToNRL7Bsk+rOjWuSxEp1G0q7Db69VYx64ozUmW wSsd01jTXBl8XIdk+b8DClauEzniLVKh7W11h04JODzc8ImrFsT7Lh+j6/R482YmiNW2Ze 42vl9ojiFgRUKWaNloO3PGTYkZFGOMHCe6u4T3qQbmFG3bEqq+i2YvIwp/TdD0Z5o1fLpD Bbfd8MnsbSYB9ApGmTPhjZ03JvzpgJhQ/RgRpj+DFJ8eFUXAVLv33+jzKWGgGA== 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 4TYM1b2T0zzNnC; Mon, 12 Feb 2024 11:00:19 +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 41CB0JTT033178; Mon, 12 Feb 2024 11:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0JSF033175; Mon, 12 Feb 2024 11:00:19 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:19 GMT Message-Id: <202402121100.41CB0JSF033175@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: 09ba07011a62 - main - mixer(8): Improve error messsages and warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 09ba07011a627e3ea05e0be8ee6db76fd2371540 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=09ba07011a627e3ea05e0be8ee6db76fd2371540 commit 09ba07011a627e3ea05e0be8ee6db76fd2371540 Author: Christos Margiolis AuthorDate: 2024-02-12 10:58:55 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 10:59:58 +0000 mixer(8): Improve error messsages and warnings No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43793 --- usr.sbin/mixer/mixer.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index bb868fb5ca9b..043c8c412857 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -66,9 +66,10 @@ main(int argc, char *argv[]) aflag = 1; break; case 'd': + errno = 0; dunit = strtol(optarg, NULL, 10); if (errno == EINVAL || errno == ERANGE) - err(1, "strtol"); + err(1, "strtol(%s)", optarg); dflag = 1; break; case 'f': @@ -92,11 +93,11 @@ main(int argc, char *argv[]) /* Print all mixers and exit. */ if (aflag) { if ((n = mixer_get_nmixers()) < 0) - err(1, "mixer_get_nmixers"); + errx(1, "no mixers present in the system"); for (i = 0; i < n; i++) { (void)snprintf(buf, sizeof(buf), "/dev/mixer%d", i); if ((m = mixer_open(buf)) == NULL) - err(1, "mixer_open: %s", buf); + errx(1, "%s: no such mixer", buf); initctls(m); if (sflag) printrecsrc(m, oflag); @@ -111,7 +112,7 @@ main(int argc, char *argv[]) } if ((m = mixer_open(name)) == NULL) - err(1, "mixer_open: %s", name); + errx(1, "%s: no such mixer", name); initctls(m); @@ -212,7 +213,7 @@ initctls(struct mixer *m) } if (rc) { (void)mixer_close(m); - err(1, "cannot make controls"); + errx(1, "cannot make mixer controls"); } } @@ -315,7 +316,7 @@ set_dunit(struct mixer *m, int dunit) return (-1); } if (mixer_set_dunit(m, dunit) < 0) { - warn("cannot set default unit to: %d", dunit); + warn("cannot set default unit to %d", dunit); return (-1); } printf("default_unit: %d -> %d\n", n, dunit);