X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=playlist.c;h=46333a00eef684cac5c3f5812811551875e8ad2a;hb=2edd5e54e7443ed42d4c4e56c2efb242956f818b;hp=c822e0802c53fdfbb72b5d728e0ca84aabbedc45;hpb=a28eef552dc779eac12c1df430522dc4e20ae428;p=paraslash.git

diff --git a/playlist.c b/playlist.c
index c822e080..46333a00 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -95,9 +95,9 @@ static int check_playlist_path(char *path, void *data)
 	struct osl_row *aft_row;
 	int ret = aft_get_row_of_path(path, &aft_row);
 
-	if (ret >= 0)
-		return 1;
-	return para_printf(pb, "%s: %s\n", path, para_strerror(-ret));
+	if (ret < 0)
+		para_printf(pb, "%s: %s\n", path, para_strerror(-ret));
+	return 1; /* do not fail the loop on bad paths */
 }
 
 static int check_playlist(struct osl_row *row, void *data)
@@ -107,18 +107,18 @@ static int check_playlist(struct osl_row *row, void *data)
 	char *playlist_name;
 	int ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def);
 
-	if (ret < 0)
-		return para_printf(pb, "failed to get playlist data: %s\n",
+	if (ret < 0) { /* log error, but continue */
+		para_printf(pb, "failed to get playlist data: %s\n",
 			para_strerror(-ret));
+		return 1;
+	}
 	if (*playlist_name) { /* skip dummy row */
-		ret = para_printf(pb, "checking playlist %s...\n", playlist_name);
-		if (ret < 0)
-			return ret;
-		ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+		para_printf(pb, "checking playlist %s...\n", playlist_name);
+		for_each_line(FELF_READ_ONLY, playlist_def.data,
 			playlist_def.size, check_playlist_path, pb);
 	}
 	osl_close_disk_object(&playlist_def);
-	return ret;
+	return 1;
 }
 
 /**
@@ -126,8 +126,6 @@ static int check_playlist(struct osl_row *row, void *data)
  *
  * \param fd The afs socket.
  * \param query Unused.
- *
- * \return The return value of the underlying call to osl_rbtree_loop().
  */
 void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
 {
@@ -139,10 +137,7 @@ void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
 		},
 		.max_size_handler = afs_max_size_handler,
 	};
-	int ret = para_printf(&pb, "checking playlists...\n");
-
-	if (ret < 0)
-		return;
+	para_printf(&pb, "checking playlists...\n");
 	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
 		check_playlist);
 	if (pb.offset)