aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dump_playlist.cxx5
-rw-r--r--test/dump_text_file.cxx9
-rw-r--r--test/read_tags.cxx3
-rw-r--r--test/run_decoder.cxx5
-rw-r--r--test/run_inotify.cxx5
-rw-r--r--test/run_input.cxx11
-rw-r--r--test/run_resolver.cxx5
7 files changed, 25 insertions, 18 deletions
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index af73ed4e7..2f6b3ed2a 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -32,6 +32,7 @@
#include "PlaylistPlugin.hxx"
#include "fs/Path.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#include <glib.h>
@@ -174,7 +175,7 @@ int main(int argc, char **argv)
io_thread_start();
if (!input_stream_global_init(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
@@ -193,7 +194,7 @@ int main(int argc, char **argv)
is = input_stream::Open(uri, mutex, cond, error);
if (is == NULL) {
if (error.IsDefined())
- g_warning("%s", error.GetMessage());
+ LogError(error);
else
g_printerr("input_stream::Open() failed\n");
return 2;
diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx
index 286c63c93..685f0fbb9 100644
--- a/test/dump_text_file.cxx
+++ b/test/dump_text_file.cxx
@@ -25,6 +25,7 @@
#include "stdbin.h"
#include "TextInputStream.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#ifdef ENABLE_ARCHIVE
#include "ArchiveList.hxx"
@@ -66,7 +67,7 @@ dump_input_stream(struct input_stream *is)
is->WaitReady();
if (!is->Check(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
is->Unlock();
return EXIT_FAILURE;
}
@@ -82,7 +83,7 @@ dump_input_stream(struct input_stream *is)
is->Lock();
if (!is->Check(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
is->Unlock();
return EXIT_FAILURE;
}
@@ -123,7 +124,7 @@ int main(int argc, char **argv)
Error error;
if (!input_stream_global_init(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
@@ -138,7 +139,7 @@ int main(int argc, char **argv)
is->Close();
} else {
if (error.IsDefined())
- g_warning("%s", error.GetMessage());
+ LogError(error);
else
g_printerr("input_stream::Open() failed\n");
ret = 2;
diff --git a/test/read_tags.cxx b/test/read_tags.cxx
index d7f2f38d9..b4e5b2bb0 100644
--- a/test/read_tags.cxx
+++ b/test/read_tags.cxx
@@ -28,6 +28,7 @@
#include "tag/TagId3.hxx"
#include "tag/ApeTag.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#include <glib.h>
@@ -167,7 +168,7 @@ int main(int argc, char **argv)
Error error;
if (!input_stream_global_init(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index 794302b5d..c2aa1d7d6 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -25,6 +25,7 @@
#include "InputStream.hxx"
#include "AudioFormat.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#include "stdbin.h"
#include <glib.h>
@@ -167,7 +168,7 @@ int main(int argc, char **argv)
Error error;
if (!input_stream_global_init(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
@@ -192,7 +193,7 @@ int main(int argc, char **argv)
input_stream::Open(decoder.uri, mutex, cond, error);
if (is == NULL) {
if (error.IsDefined())
- g_warning("%s", error.GetMessage());
+ LogError(error);
else
g_printerr("input_stream::Open() failed\n");
diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx
index 459d0c504..6796480e5 100644
--- a/test/run_inotify.cxx
+++ b/test/run_inotify.cxx
@@ -21,6 +21,7 @@
#include "InotifySource.hxx"
#include "event/Loop.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#include <glib.h>
@@ -68,14 +69,14 @@ int main(int argc, char **argv)
my_inotify_callback,
nullptr, error);
if (source == NULL) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
int descriptor = source->Add(path, IN_MASK, error);
if (descriptor < 0) {
delete source;
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 79b57536a..d278676ce 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -26,6 +26,7 @@
#include "InputInit.hxx"
#include "IOThread.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#ifdef ENABLE_ARCHIVE
#include "ArchiveList.hxx"
@@ -61,7 +62,7 @@ dump_input_stream(struct input_stream *is)
is->WaitReady();
if (!is->Check(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
is->Unlock();
return EXIT_FAILURE;
}
@@ -84,7 +85,7 @@ dump_input_stream(struct input_stream *is)
num_read = is->Read(buffer, sizeof(buffer), error);
if (num_read == 0) {
if (error.IsDefined())
- g_warning("%s", error.GetMessage());
+ LogError(error);
break;
}
@@ -95,7 +96,7 @@ dump_input_stream(struct input_stream *is)
}
if (!is->Check(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
is->Unlock();
return EXIT_FAILURE;
}
@@ -136,7 +137,7 @@ int main(int argc, char **argv)
#endif
if (!input_stream_global_init(error)) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return 2;
}
@@ -151,7 +152,7 @@ int main(int argc, char **argv)
is->Close();
} else {
if (error.IsDefined())
- g_warning("%s", error.GetMessage());
+ LogError(error);
else
g_printerr("input_stream::Open() failed\n");
ret = 2;
diff --git a/test/run_resolver.cxx b/test/run_resolver.cxx
index 559e12934..7da2fd5b2 100644
--- a/test/run_resolver.cxx
+++ b/test/run_resolver.cxx
@@ -20,6 +20,7 @@
#include "config.h"
#include "system/Resolver.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#include <glib.h>
@@ -45,7 +46,7 @@ int main(int argc, char **argv)
resolve_host_port(argv[1], 80, AI_PASSIVE, SOCK_STREAM,
error);
if (ai == NULL) {
- g_warning("%s", error.GetMessage());
+ LogError(error);
return EXIT_FAILURE;
}
@@ -54,7 +55,7 @@ int main(int argc, char **argv)
error);
if (p == NULL) {
freeaddrinfo(ai);
- g_warning("%s", error.GetMessage());
+ LogError(error);
return EXIT_FAILURE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 08:08:34 +0000