From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Sep 2013 01:46:32 +0000 (+0000)
Subject: audiod: Print a warning if filters are ignored.
X-Git-Tag: v0.5.1~11^2~8
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=59796673d90ad532d03ebb730f928b2c755fa8b6;p=paraslash.git

audiod: Print a warning if filters are ignored.

If the regular expression of a filter specifier does not match any
audio formats, we ignore this filter spec silently. Most likely this
was not intended and deserves a log message, so let's add it.
---

diff --git a/audiod.c b/audiod.c
index 64925b76..5ed70673 100644
--- a/audiod.c
+++ b/audiod.c
@@ -914,7 +914,7 @@ out:
 
 static int parse_filter_args(void)
 {
-	int i, j, ret, af_mask;
+	int i, j, ret, af_mask, num_matches;
 
 	for (i = 0; i < conf.filter_given; i++) {
 		char *arg;
@@ -922,13 +922,18 @@ static int parse_filter_args(void)
 		if (ret < 0)
 			goto out;
 		af_mask = ret;
+		num_matches = 0;
 		FOR_EACH_AUDIO_FORMAT(j) {
 			if ((af_mask & (1 << j)) == 0) /* no match */
 				continue;
 			ret = add_filter(j, arg);
 			if (ret < 0)
 				goto out;
+			num_matches++;
 		}
+		if (num_matches == 0)
+			PARA_WARNING_LOG("ignoring filter spec: %s\n",
+				conf.filter_arg[i]);
 	}
 	ret = init_default_filters(); /* use default values for the rest */
 out: