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/ArchivePlugin.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/ArchivePlugin.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/ArchivePlugin.cxx b/src/ArchivePlugin.cxx index 7c5164220..dd2059c0f 100644 --- a/src/ArchivePlugin.cxx +++ b/src/ArchivePlugin.cxx @@ -17,27 +17,23 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "ArchivePlugin.hxx" #include "ArchiveFile.hxx" +#include "util/Error.hxx" #include <assert.h> ArchiveFile * archive_file_open(const struct archive_plugin *plugin, const char *path, - GError **error_r) + Error &error) { assert(plugin != NULL); assert(plugin->open != NULL); assert(path != NULL); - assert(error_r == NULL || *error_r == NULL); - ArchiveFile *file = plugin->open(path, error_r); - - if (file != NULL) { - assert(error_r == NULL || *error_r == NULL); - } else { - assert(error_r == NULL || *error_r != NULL); - } + ArchiveFile *file = plugin->open(path, error); + assert((file == nullptr) == error.IsDefined()); return file; } |