X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;fp=playlist.c;h=01392030a00305cea41707f4e40016507f0e20e1;hp=6441aca7a8293066e70132f57231a4c9b8643bf7;hb=9d8fdf8898418711558f70a9630b2444036d8285;hpb=8843e506d1af0f71c61e2c301bea9b612187e360

diff --git a/playlist.c b/playlist.c
index 6441aca7..01392030 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,47 +107,33 @@ 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;
 }
 
 /**
  * Check the playlist table for inconsistencies.
  *
- * \param fd The afs socket.
- * \param query Unused.
+ * \param aca This callback ignores ->query.
  *
- * \return The return value of the underlying call to osl_rbtree_loop().
+ * \return Standard. Invalid paths are reported, but are not considered an
+ * error.
  */
-void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
+int playlist_check_callback(struct afs_callback_arg *aca)
 {
-	struct para_buffer pb = {
-		.max_size = shm_get_shmmax(),
-		.private_data = &(struct afs_max_size_handler_data) {
-			.fd = fd,
-			.band = SBD_OUTPUT
-		},
-		.max_size_handler = afs_max_size_handler,
-	};
-	int ret = para_printf(&pb, "checking playlists...\n");
-
-	if (ret < 0)
-		return;
-	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
-		check_playlist);
-	if (pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+	para_printf(&aca->pbout, "checking playlists...\n");
+	return osl(osl_rbtree_loop(playlists_table, BLOBCOL_ID, &aca->pbout,
+		check_playlist));
 }
 
 /**