diff options
author | Max Kellermann <max@duempel.org> | 2009-07-05 08:29:52 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-07-05 08:29:52 +0200 |
commit | 111c4dac633418f20559289dbe9a7e3efe2ac4bd (patch) | |
tree | 03892c0c9ea389a1d57565b8c4e13b9d537ceb8e | |
parent | 69ff9d757f66ee7afaf7a9220aec253da1e9350f (diff) | |
download | mpd-111c4dac633418f20559289dbe9a7e3efe2ac4bd.tar.gz mpd-111c4dac633418f20559289dbe9a7e3efe2ac4bd.tar.xz mpd-111c4dac633418f20559289dbe9a7e3efe2ac4bd.zip |
song_save: use GError for error handling
Diffstat (limited to '')
-rw-r--r-- | src/directory_save.c | 5 | ||||
-rw-r--r-- | src/song_save.c | 23 | ||||
-rw-r--r-- | src/song_save.h | 16 |
3 files changed, 36 insertions, 8 deletions
diff --git a/src/directory_save.c b/src/directory_save.c index 28aadd96c..cb76b225f 100644 --- a/src/directory_save.c +++ b/src/directory_save.c @@ -138,7 +138,10 @@ directory_load(FILE *fp, struct directory *directory, GError **error) if (!success) return false; } else if (g_str_has_prefix(buffer, SONG_BEGIN)) { - songvec_load(fp, &directory->songs, directory); + success = songvec_load(fp, &directory->songs, + directory, error); + if (!success) + return false; } else { g_set_error(error, directory_quark(), 0, "Malformed line: %s", buffer); diff --git a/src/song_save.c b/src/song_save.c index 4f48e9716..3e54ce222 100644 --- a/src/song_save.c +++ b/src/song_save.c @@ -34,6 +34,12 @@ #define SONG_KEY "key: " #define SONG_MTIME "mtime: " +static GQuark +song_save_quark(void) +{ + return g_quark_from_static_string("song_save"); +} + static void song_save_url(FILE *fp, struct song *song) { @@ -110,8 +116,9 @@ parse_tag_value(char *buffer, enum tag_type *type_r) return NULL; } -void -songvec_load(FILE *fp, struct songvec *sv, struct directory *parent) +bool +songvec_load(FILE *fp, struct songvec *sv, struct directory *parent, + GError **error_r) { char buffer[MPD_PATH_MAX + 1024]; struct song *song = NULL; @@ -131,7 +138,9 @@ songvec_load(FILE *fp, struct songvec *sv, struct directory *parent) } else if (*buffer == 0) { /* ignore empty lines (starting with '\0') */ } else if (song == NULL) { - g_error("Problems reading song info"); + g_set_error(error_r, song_save_quark(), 0, + "Problems reading song info"); + return false; } else if (0 == strncmp(SONG_FILE, buffer, strlen(SONG_FILE))) { /* we don't need this info anymore */ } else if ((value = parse_tag_value(buffer, @@ -151,11 +160,15 @@ songvec_load(FILE *fp, struct songvec *sv, struct directory *parent) song->tag->time = atoi(&(buffer[strlen(SONG_TIME)])); } else if (0 == strncmp(SONG_MTIME, buffer, strlen(SONG_MTIME))) { song->mtime = atoi(&(buffer[strlen(SONG_MTIME)])); + } else { + g_set_error(error_r, song_save_quark(), 0, + "unknown line in db: %s", buffer); + return false; } - else - g_error("unknown line in db: %s", buffer); } if (song) commit_song(sv, song); + + return true; } diff --git a/src/song_save.h b/src/song_save.h index b5db3e050..36e03584e 100644 --- a/src/song_save.h +++ b/src/song_save.h @@ -20,6 +20,9 @@ #ifndef MPD_SONG_SAVE_H #define MPD_SONG_SAVE_H +#include <glib.h> + +#include <stdbool.h> #include <stdio.h> struct songvec; @@ -27,7 +30,16 @@ struct directory; void songvec_save(FILE *fp, struct songvec *sv); -void -songvec_load(FILE *fp, struct songvec *sv, struct directory *parent); +/** + * Loads songs from the input file and add the to the specified + * directory. + * + * @param error_r location to store the error occuring, or NULL to + * ignore errors + * @return true on success, false on error + */ +bool +songvec_load(FILE *file, struct songvec *sv, struct directory *parent, + GError **error_r); #endif |