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 /test/run_inotify.cxx | |
parent | c9fcc7f14860777458153eb2d13c773ccfa1daa2 (diff) |
util/Error: new error passing library
Replaces GLib's GError.
Diffstat (limited to 'test/run_inotify.cxx')
-rw-r--r-- | test/run_inotify.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx index e8ca4c8bd..459d0c504 100644 --- a/test/run_inotify.cxx +++ b/test/run_inotify.cxx @@ -20,6 +20,7 @@ #include "config.h" #include "InotifySource.hxx" #include "event/Loop.hxx" +#include "util/Error.hxx" #include <glib.h> @@ -51,7 +52,6 @@ my_inotify_callback(gcc_unused int wd, unsigned mask, int main(int argc, char **argv) { - GError *error = NULL; const char *path; if (argc != 2) { @@ -63,20 +63,19 @@ int main(int argc, char **argv) event_loop = new EventLoop(EventLoop::Default()); + Error error; InotifySource *source = InotifySource::Create(*event_loop, my_inotify_callback, - nullptr, &error); + nullptr, error); if (source == NULL) { - g_warning("%s", error->message); - g_error_free(error); + g_warning("%s", error.GetMessage()); return 2; } - int descriptor = source->Add(path, IN_MASK, &error); + int descriptor = source->Add(path, IN_MASK, error); if (descriptor < 0) { delete source; - g_warning("%s", error->message); - g_error_free(error); + g_warning("%s", error.GetMessage()); return 2; } |