From 859aac7242fe3767c19c1bfff73d5e6159cbad31 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 28 Dec 2008 19:54:49 +0100 Subject: utils: removed myFgets() Replaced myFgets() with fgets() + g_strchomp(). --- src/song_save.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/song_save.c') diff --git a/src/song_save.c b/src/song_save.c index 41e69461..ff5aeb1a 100644 --- a/src/song_save.c +++ b/src/song_save.c @@ -104,11 +104,13 @@ void readSongInfoIntoList(FILE *fp, struct songvec *sv, struct directory *parent) { char buffer[MPD_PATH_MAX + 1024]; - int bufferSize = MPD_PATH_MAX + 1024; struct song *song = NULL; int itemType; - while (myFgets(buffer, bufferSize, fp) && 0 != strcmp(SONG_END, buffer)) { + while (fgets(buffer, sizeof(buffer), fp) && + !g_str_has_prefix(buffer, SONG_END)) { + g_strchomp(buffer); + if (0 == strncmp(SONG_KEY, buffer, strlen(SONG_KEY))) { if (song) insertSongIntoList(sv, song); -- cgit v1.2.3