X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=df34fa145faed3281bb373c03b52db1b64800400;hp=f01f1868e60b1592c9bde8f0d371234edd60d23a;hb=83de7d8cce8b95628507bd151444a51e172991fb;hpb=b66dfd41e268e64b65d2990bdec3d3a7e119e234

diff --git a/aft.c b/aft.c
index f01f1868..df34fa14 100644
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -280,7 +280,7 @@ static struct osl_table_description audio_file_table_desc = {
 	.column_descriptions = aft_cols
 };
 
-/* We don't want * dot or dot-dot anywhere. */
+/* We don't want dot or dot-dot anywhere. */
 static int verify_dotfile(const char *rest)
 {
 	/*
@@ -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,8 +1106,8 @@ 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;
 	ret = mmap_full_file(path, O_RDONLY, &map.data,
@@ -1694,7 +1694,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	uint16_t afhi_offset, chunks_offset;
 
 	hash = (unsigned char *)buf + CAB_HASH_OFFSET;
-	hash_to_asc(hash, asc);;
+	hash_to_asc(hash, asc);
 	objs[AFTCOL_HASH].data = buf + CAB_HASH_OFFSET;
 	objs[AFTCOL_HASH].size = HASH_SIZE;