X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=playlist.c;h=0aa4d9c1486c64c0632bbbe608669cb9700528ef;hb=213b3181e7f8ebd07ec37e256188ea9094722cef;hp=48ee4ca78d8174ed32da793749566214f5ecd721;hpb=01a7db579a518a1a03b940a5a42411e49123ac1b;p=paraslash.git

diff --git a/playlist.c b/playlist.c
index 48ee4ca7..0aa4d9c1 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -70,8 +70,8 @@ static int load_playlist(struct osl_row *row, void *data)
 	if (ret < 0)
 		goto err;
 	playlist->length = 0;
-	ret = for_each_line_ro(playlist_def.data, playlist_def.size,
-		add_playlist_entry, playlist);
+	ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+		playlist_def.size, add_playlist_entry, playlist);
 	osl_close_disk_object(&playlist_def);
 	if (ret < 0)
 		goto err;
@@ -114,8 +114,8 @@ static int check_playlist(struct osl_row *row, void *data)
 		ret = para_printf(pb, "checking playlist %s...\n", playlist_name);
 		if (ret < 0)
 			return ret;
-		ret = for_each_line_ro(playlist_def.data, playlist_def.size,
-			check_playlist_path, pb);
+		ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+			playlist_def.size, check_playlist_path, pb);
 	}
 	osl_close_disk_object(&playlist_def);
 	return ret;
@@ -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)
 {
@@ -219,8 +217,8 @@ static int handle_audio_file_event(enum afs_events event, void *data)
 	ret = pl_get_def_by_name(current_playlist.name, &playlist_def);
 	if (ret < 0)
 		return ret;
-	ret = for_each_line_ro(playlist_def.data, playlist_def.size,
-		search_path, new_path);
+	ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+		playlist_def.size, search_path, new_path);
 	osl_close_disk_object(&playlist_def);
 	is_admissible = (ret < 0);
 	if (was_admissible && is_admissible)