diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-10 18:02:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-04 18:14:22 +0200 |
| commit | 29030b54c98b0aee65fbc10ebf7ba36bed98c02c (patch) | |
| tree | 79766830b55ebca38ddbce84d8d548227eedb69e /src/PlaylistAny.cxx | |
| parent | c9fcc7f14860777458153eb2d13c773ccfa1daa2 (diff) | |
| download | mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.gz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.xz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.zip | |
util/Error: new error passing library
Replaces GLib's GError.
Diffstat (limited to '')
| -rw-r--r-- | src/PlaylistAny.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/PlaylistAny.cxx b/src/PlaylistAny.cxx index e77b01467..9070f12a6 100644 --- a/src/PlaylistAny.cxx +++ b/src/PlaylistAny.cxx @@ -22,6 +22,7 @@ #include "PlaylistMapper.hxx" #include "PlaylistRegistry.hxx" #include "util/UriUtil.hxx" +#include "util/Error.hxx" #include "InputLegacy.hxx" #include <assert.h> @@ -39,14 +40,12 @@ playlist_open_remote(const char *uri, Mutex &mutex, Cond &cond, return playlist; } - GError *error = NULL; - struct input_stream *is = input_stream_open(uri, mutex, cond, &error); + Error error; + input_stream *is = input_stream_open(uri, mutex, cond, error); if (is == NULL) { - if (error != NULL) { + if (error.IsDefined()) g_warning("Failed to open %s: %s", - uri, error->message); - g_error_free(error); - } + uri, error.GetMessage()); return NULL; } |