From dca405a746e0b86e37659bdb112358324fc48d28 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 3 Jul 2011 15:20:28 +0200
Subject: test/read_conf: fix -Wunused-but-set-variable

---
 test/read_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/read_conf.c b/test/read_conf.c
index 4f43e6a2e..e96bd9046 100644
--- a/test/read_conf.c
+++ b/test/read_conf.c
@@ -70,5 +70,5 @@ int main(int argc, char **argv)
 	}
 
 	config_global_finish();
-	return 0;
+	return ret;
 }
-- 
cgit v1.2.3


From 52e2fa91c4c322bc0d8a12a825370f91aa7fecc6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 3 Jul 2011 15:20:39 +0200
Subject: test/read_conf: make variables more local

---
 test/read_conf.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/read_conf.c b/test/read_conf.c
index e96bd9046..f1b38cafe 100644
--- a/test/read_conf.c
+++ b/test/read_conf.c
@@ -37,30 +37,28 @@ my_log_func(G_GNUC_UNUSED const gchar *log_domain,
 
 int main(int argc, char **argv)
 {
-	const char *path, *name, *value;
-	GError *error = NULL;
-	bool success;
-	int ret;
-
 	if (argc != 3) {
 		g_printerr("Usage: read_conf FILE SETTING\n");
 		return 1;
 	}
 
-	path = argv[1];
-	name = argv[2];
+	const char *path = argv[1];
+	const char *name = argv[2];
 
 	g_log_set_default_handler(my_log_func, NULL);
 
 	config_global_init();
-	success = config_read_file(path, &error);
+
+	GError *error = NULL;
+	bool success = config_read_file(path, &error);
 	if (!success) {
 		g_printerr("%s:", error->message);
 		g_error_free(error);
 		return 1;
 	}
 
-	value = config_get_string(name, NULL);
+	const char *value = config_get_string(name, NULL);
+	int ret;
 	if (value != NULL) {
 		g_print("%s\n", value);
 		ret = 0;
-- 
cgit v1.2.3


From cca2c2f4ca42f1c6a15d16bd2e8384971dad811d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 3 Jul 2011 15:21:40 +0200
Subject: test/run_filter: remove unused variable "frame_size"

---
 test/run_filter.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'test')

diff --git a/test/run_filter.c b/test/run_filter.c
index ee2445eac..3758eb5bb 100644
--- a/test/run_filter.c
+++ b/test/run_filter.c
@@ -106,7 +106,6 @@ int main(int argc, char **argv)
 	struct filter *filter;
 	const struct audio_format *out_audio_format;
 	char buffer[4096];
-	size_t frame_size;
 
 	if (argc < 3 || argc > 4) {
 		g_printerr("Usage: run_filter CONFIG NAME [FORMAT] <IN\n");
@@ -162,8 +161,6 @@ int main(int argc, char **argv)
 	g_printerr("audio_format=%s\n",
 		   audio_format_to_string(out_audio_format, &af_string));
 
-	frame_size = audio_format_frame_size(&audio_format);
-
 	/* play */
 
 	while (true) {
-- 
cgit v1.2.3