oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/Error: new error passing library

Browse Source 
Replaces GLib's GError.
This commit is contained in:
Max Kellermann
2013-08-10 18:02:44 +02:00
parent c9fcc7f148
commit 29030b54c9
256 changed files with 3269 additions and 3371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/visit_archive.cxx
View File

@@ -28,6 +28,7 @@
#include "ArchiveFile.hxx"
#include "ArchiveVisitor.hxx"
#include "fs/Path.hxx"
#include "util/Error.hxx"
#include <glib.h>
@@ -54,7 +55,7 @@ class MyArchiveVisitor final : public ArchiveVisitor {
int
main(int argc, char **argv)
{
GError *error = nullptr;
Error error;
if (argc != 3) {
fprintf(stderr, "Usage: visit_archive PLUGIN PATH\n");
@@ -81,9 +82,8 @@ main(int argc, char **argv)
archive_plugin_init_all();
if (!input_stream_global_init(&error)) {
g_warning("%s", error->message);
g_error_free(error);
if (!input_stream_global_init(error)) {
fprintf(stderr, "%s", error.GetMessage());
return 2;
}
@@ -97,14 +97,13 @@ main(int argc, char **argv)
int result = EXIT_SUCCESS;
ArchiveFile *file = archive_file_open(plugin, path.c_str(), &error);
ArchiveFile *file = archive_file_open(plugin, path.c_str(), error);
if (file != nullptr) {
MyArchiveVisitor visitor;
file->Visit(visitor);
file->Close();
} else {
fprintf(stderr, "%s\n", error->message);
g_error_free(error);
fprintf(stderr, "%s", error.GetMessage());
result = EXIT_FAILURE;
}