From 29030b54c98b0aee65fbc10ebf7ba36bed98c02c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 10 Aug 2013 18:02:44 +0200 Subject: util/Error: new error passing library Replaces GLib's GError. --- src/input/ArchiveInputPlugin.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/input/ArchiveInputPlugin.cxx') 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 @@ -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(); -- cgit v1.2.3