Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Jun 2026 10:49:50 +0000
From:      Christos Margiolis <christos@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 5ec4a7bb2cdf - stable/15 - mixer(8): Retire deprecated control values
Message-ID:  <6a36704e.1eb84.53a7301f@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=5ec4a7bb2cdfe387b4739425fc82d6399695bd2d

commit 5ec4a7bb2cdfe387b4739425fc82d6399695bd2d
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-06-13 16:29:40 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-06-20 10:49:45 +0000

    mixer(8): Retire deprecated control values
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    
    (cherry picked from commit de2a1366022d71c1d650832d378964c4cbe65ba7)
---
 usr.sbin/mixer/mixer.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index c9efacc666eb..e8c36d0c8bf7 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -430,19 +430,10 @@ mod_mute(struct mix_dev *d, void *p)
 	val = p;
 	if (strncmp(val, "off", strlen(val)) == 0) {
 		opt = MIX_UNMUTE;
-	} else if (strncmp(val, "0", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"off\" instead", val);
-		opt = MIX_UNMUTE;
 	} else if (strncmp(val, "on", strlen(val)) == 0) {
 		opt = MIX_MUTE;
-	} else if (strncmp(val, "1", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"on\" instead", val);
-		opt = MIX_MUTE;
 	} else if (strncmp(val, "toggle", strlen(val)) == 0) {
 		opt = MIX_TOGGLEMUTE;
-	} else if (strncmp(val, "^", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"toggle\" instead", val);
-		opt = MIX_TOGGLEMUTE;
 	} else {
 		warnx("%s: no such modifier", val);
 		return (-1);
@@ -472,24 +463,12 @@ mod_recsrc(struct mix_dev *d, void *p)
 	val = p;
 	if (strncmp(val, "add", strlen(val)) == 0) {
 		opt = MIX_ADDRECSRC;
-	} else if (strncmp(val, "+", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"add\" instead", val);
-		opt = MIX_ADDRECSRC;
 	} else if (strncmp(val, "remove", strlen(val)) == 0) {
 		opt = MIX_REMOVERECSRC;
-	} else if (strncmp(val, "-", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"remove\" instead", val);
-		opt = MIX_REMOVERECSRC;
 	} else if (strncmp(val, "set", strlen(val)) == 0) {
 		opt = MIX_SETRECSRC;
-	} else if (strncmp(val, "=", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"set\" instead", val);
-		opt = MIX_SETRECSRC;
 	} else if (strncmp(val, "toggle", strlen(val)) == 0) {
 		opt = MIX_TOGGLERECSRC;
-	} else if (strncmp(val, "^", strlen(val)) == 0) {
-		warnx("%s: deprecated: use \"toggle\" instead", val);
-		opt = MIX_TOGGLERECSRC;
 	} else {
 		warnx("%s: no such modifier", val);
 		return (-1);


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a36704e.1eb84.53a7301f>