X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=301da7c7687ab1a461ec6e157ba44717f21135f0;hp=a2883d4af1438ea9ab30e93a94ebc1a3ba5b1419;hb=1641ae9fd2ed9bee616396a410c6e5cf65253064;hpb=513fd2c3a4fad82e4dc383d303479c3ff0439523

diff --git a/aft.c b/aft.c
index a2883d4a..301da7c7 100644
--- a/aft.c
+++ b/aft.c
@@ -830,8 +830,8 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 	ret = aft_get_row_of_hash(d->hash, &aft_row);
 	if (ret < 0)
 		return ret;
-	ret = osl_open_disk_object(audio_file_table, aft_row,
-		AFTCOL_CHUNKS, &chunk_table_obj);
+	ret = osl(osl_open_disk_object(audio_file_table, aft_row,
+		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0)
 		return ret;
 	ret = para_printf(b, "%s\n"
@@ -1106,10 +1106,10 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	if (ret < 0)
 		return ret;
 	afd->afhi.chunk_table = NULL;
-	ret = osl_open_disk_object(audio_file_table, aft_row,
-		AFTCOL_CHUNKS, &chunk_table_obj);
+	ret = osl(osl_open_disk_object(audio_file_table, aft_row,
+		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0)
-		goto err;
+		return ret;
 	ret = mmap_full_file(path, O_RDONLY, &map.data,
 		&map.size, &afd->fd);
 	if (ret < 0)
@@ -1718,10 +1718,11 @@ static void com_add_callback(int fd, const struct osl_object *query)
 		struct osl_object obj;
 		if (pb) { /* hs trumps pb, remove pb */
 			if (flags & ADD_FLAG_VERBOSE) {
-				ret = para_printf(&msg, "removing path brother\n");
+				ret = para_printf(&msg, "removing %s\n", path);
 				if (ret < 0)
 					goto out;
 			}
+			afs_event(AUDIO_FILE_REMOVE, &msg, pb);
 			ret = osl(osl_del_row(audio_file_table, pb));
 			if (ret < 0)
 				goto out;