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/input/ArchiveInputPlugin.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 'src/input/ArchiveInputPlugin.cxx')
| -rw-r--r-- | src/input/ArchiveInputPlugin.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx index 0d856527f..025b25fef 100644 --- a/src/input/ArchiveInputPlugin.cxx +++ b/src/input/ArchiveInputPlugin.cxx @@ -24,6 +24,7 @@ #include "ArchivePlugin.hxx" #include "ArchiveFile.hxx" #include "InputPlugin.hxx" +#include "util/Error.hxx" #include <glib.h> @@ -38,7 +39,7 @@ static struct input_stream * input_archive_open(const char *pathname, Mutex &mutex, Cond &cond, - GError **error_r) + Error &error) { const struct archive_plugin *arplug; char *archive, *filename, *suffix, *pname; @@ -63,14 +64,14 @@ input_archive_open(const char *pathname, return NULL; } - auto file = archive_file_open(arplug, archive, error_r); + auto file = archive_file_open(arplug, archive, error); if (file == NULL) { g_free(pname); return NULL; } //setup fileops - is = file->OpenStream(filename, mutex, cond, error_r); + is = file->OpenStream(filename, mutex, cond, error); g_free(pname); file->Close(); |