From 83aac2a057069de88e551899583fa0ab5662f753 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 15 Dec 2009 19:07:20 +0100
Subject: test/run_input: initialize archive plugins
Enable archive plugin debugging.
---
test/run_input.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'test')
diff --git a/test/run_input.c b/test/run_input.c
index 37c792b86..b91d367ba 100644
--- a/test/run_input.c
+++ b/test/run_input.c
@@ -17,11 +17,16 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include "input_stream.h"
#include "tag_pool.h"
#include "tag_save.h"
#include "conf.h"
+#ifdef ENABLE_ARCHIVE
+#include "archive_list.h"
+#endif
+
#include <glib.h>
#include <unistd.h>
@@ -58,6 +63,11 @@ int main(int argc, char **argv)
tag_pool_init();
config_global_init();
+
+#ifdef ENABLE_ARCHIVE
+ archive_plugin_init_all();
+#endif
+
input_stream_global_init();
/* open the stream and wait until it becomes ready */
@@ -107,6 +117,11 @@ int main(int argc, char **argv)
input_stream_close(&is);
input_stream_global_finish();
+
+#ifdef ENABLE_ARCHIVE
+ archive_plugin_deinit_all();
+#endif
+
config_global_finish();
tag_pool_deinit();
--
cgit v1.2.3
From 81aa58efa8912f8c042650d82e9c3be155f343bc Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 15 Dec 2009 19:36:22 +0100
Subject: test/run_input: deinitialize everything after open() error
This enables valgrind debugging after an error occurred.
---
test/run_input.c | 90 +++++++++++++++++++++++++++++++-------------------------
1 file changed, 50 insertions(+), 40 deletions(-)
(limited to 'test')
diff --git a/test/run_input.c b/test/run_input.c
index b91d367ba..5d74473e3 100644
--- a/test/run_input.c
+++ b/test/run_input.c
@@ -41,45 +41,17 @@ my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level,
g_printerr("%s\n", message);
}
-int main(int argc, char **argv)
+static int
+dump_input_stream(struct input_stream *is)
{
- struct input_stream is;
- bool success;
char buffer[4096];
size_t num_read;
ssize_t num_written;
- if (argc != 2) {
- g_printerr("Usage: run_input URI\n");
- return 1;
- }
-
- /* initialize GLib */
-
- g_thread_init(NULL);
- g_log_set_default_handler(my_log_func, NULL);
-
- /* initialize MPD */
-
- tag_pool_init();
- config_global_init();
-
-#ifdef ENABLE_ARCHIVE
- archive_plugin_init_all();
-#endif
-
- input_stream_global_init();
-
- /* open the stream and wait until it becomes ready */
+ /* wait until the stream becomes ready */
- success = input_stream_open(&is, argv[1]);
- if (!success) {
- g_printerr("input_stream_open() failed\n");
- return 2;
- }
-
- while (!is.ready) {
- int ret = input_stream_buffer(&is);
+ while (!is->ready) {
+ int ret = input_stream_buffer(is);
if (ret < 0)
/* error */
return 2;
@@ -91,20 +63,20 @@ int main(int argc, char **argv)
/* print meta data */
- if (is.mime != NULL)
- g_printerr("MIME type: %s\n", is.mime);
+ if (is->mime != NULL)
+ g_printerr("MIME type: %s\n", is->mime);
/* read data and tags from the stream */
- while (!input_stream_eof(&is)) {
- struct tag *tag = input_stream_tag(&is);
+ while (!input_stream_eof(is)) {
+ struct tag *tag = input_stream_tag(is);
if (tag != NULL) {
g_printerr("Received a tag:\n");
tag_save(stderr, tag);
tag_free(tag);
}
- num_read = input_stream_read(&is, buffer, sizeof(buffer));
+ num_read = input_stream_read(is, buffer, sizeof(buffer));
if (num_read == 0)
break;
@@ -113,9 +85,47 @@ int main(int argc, char **argv)
break;
}
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ struct input_stream is;
+ int ret;
+
+ if (argc != 2) {
+ g_printerr("Usage: run_input URI\n");
+ return 1;
+ }
+
+ /* initialize GLib */
+
+ g_thread_init(NULL);
+ g_log_set_default_handler(my_log_func, NULL);
+
+ /* initialize MPD */
+
+ tag_pool_init();
+ config_global_init();
+
+#ifdef ENABLE_ARCHIVE
+ archive_plugin_init_all();
+#endif
+
+ input_stream_global_init();
+
+ /* open the stream and dump it */
+
+ if (input_stream_open(&is, argv[1])) {
+ ret = dump_input_stream(&is);
+ input_stream_close(&is);
+ } else {
+ g_printerr("input_stream_open() failed\n");
+ ret = 2;
+ }
+
/* deinitialize everything */
- input_stream_close(&is);
input_stream_global_finish();
#ifdef ENABLE_ARCHIVE
@@ -125,5 +135,5 @@ int main(int argc, char **argv)
config_global_finish();
tag_pool_deinit();
- return 0;
+ return ret;
}
--
cgit v1.2.3