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/SongSave.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/SongSave.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/SongSave.cxx b/src/SongSave.cxx index fcad320df..7b89eccf4 100644 --- a/src/SongSave.cxx +++ b/src/SongSave.cxx @@ -25,6 +25,8 @@ #include "TextFile.hxx" #include "Tag.hxx" #include "util/StringUtil.hxx" +#include "util/Error.hxx" +#include "util/Domain.hxx" #include <glib.h> @@ -36,11 +38,7 @@ #define SONG_MTIME "mtime" #define SONG_END "song_end" -static GQuark -song_save_quark(void) -{ - return g_quark_from_static_string("song_save"); -} +static constexpr Domain song_save_domain("song_save"); void song_save(FILE *fp, const Song *song) @@ -61,7 +59,7 @@ song_save(FILE *fp, const Song *song) Song * song_load(TextFile &file, Directory *parent, const char *uri, - GError **error_r) + Error &error) { Song *song = parent != NULL ? Song::NewFile(uri, parent) @@ -78,8 +76,8 @@ song_load(TextFile &file, Directory *parent, const char *uri, song->tag->EndAdd(); song->Free(); - g_set_error(error_r, song_save_quark(), 0, - "unknown line in db: %s", line); + error.Format(song_save_domain, + "unknown line in db: %s", line); return NULL; } @@ -120,8 +118,8 @@ song_load(TextFile &file, Directory *parent, const char *uri, song->tag->EndAdd(); song->Free(); - g_set_error(error_r, song_save_quark(), 0, - "unknown line in db: %s", line); + error.Format(song_save_domain, + "unknown line in db: %s", line); return NULL; } } |