From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 24 Jul 2007 13:19:34 +0000 (+0200)
Subject: Ignore errors with -s option
X-Git-Tag: v1.0.15rc1~5
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=fea8dbf0209130259bb9a3248d16a995e96369d8;p=alsa-utils.git

Ignore errors with -s option

Ignore non-fatal errors when stdin is parsed with -s option.
---

diff --git a/amixer/amixer.c b/amixer/amixer.c
index 9c15f8c..7da0ebe 100644
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -1372,7 +1372,7 @@ static int get_enum_item_index(snd_mixer_elem_t *elem, char **ptrp)
 static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv)
 {
 	unsigned int idx, chn = 0;
-	int check_flag = -1;
+	int check_flag = ignore_error ? 0 : -1;
 
 	for (idx = 1; idx < argc; idx++) {
 		char *ptr = argv[idx];
@@ -1396,7 +1396,7 @@ static int sset_channels(snd_mixer_elem_t *elem, unsigned int argc, char **argv)
 	unsigned int dir = 3, okflag = 3;
 	unsigned int idx;
 	snd_mixer_selem_channel_id_t chn;
-	int check_flag = -1;
+	int check_flag = ignore_error ? 0 : -1;
 
 	for (idx = 1; idx < argc; idx++) {
 		char *ptr = argv[idx], *optr;