X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=f4080233855009be5423b3bc9325b861d5f20b0c;hp=157b5a626b58306647fd3a09502efe992ed44bdc;hb=656a02453498156bab09763011ff43b81db57634;hpb=d7b4aa3835197ee906f13f515040e1cda6385544

diff --git a/aft.c b/aft.c
index 157b5a62..f4080233 100644
--- a/aft.c
+++ b/aft.c
@@ -18,7 +18,6 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.h"
 #include "fd.h"
 #include "ipc.h"
 #include "portable_io.h"
@@ -723,7 +722,7 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size,
 		} \
 	}
 
-static short unsigned get_duration_width(int seconds)
+__a_const static short unsigned get_duration_width(int seconds)
 {
 	short unsigned width;
 	unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
@@ -1824,7 +1823,7 @@ static void hash_sister_callback(int fd, const struct osl_object *query)
 static int get_row_pointer_from_result(struct osl_object *result, void *private)
 {
 	struct osl_row **row = private;
-	*row = result->data;
+	*row = *(struct osl_row **)(result->data);
 	return 1;
 }
 
@@ -2569,10 +2568,6 @@ static void aft_close(void)
 {
 	osl_close_table(audio_file_table, OSL_MARK_CLEAN);
 	audio_file_table = NULL;
-	free(status_items);
-	status_items = NULL;
-	free(parser_friendly_status_items);
-	parser_friendly_status_items = NULL;
 }
 
 /**