X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=e91d734fea7d70e74350cdcfdc3c4def9bce8a05;hp=be4d572e22f1517d1f5c3c970d30e6f6671f4158;hb=c5670af5c1f784fe6c3d46d0281f2ba7c47af75e;hpb=e01b2ffa28b6770cd8771860e1e05b9c75beabd9

diff --git a/aft.c b/aft.c
index be4d572e..e91d734f 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"
@@ -1038,7 +1037,7 @@ static int make_status_items(struct audio_file_data *afd,
 		.flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY,
 		.mode = LS_MODE_VERBOSE,
 	};
-	struct para_buffer pb = {.max_size = SHMMAX - 1};
+	struct para_buffer pb = {.max_size = shm_get_shmmax() - 1};
 	time_t current_time;
 	int ret;
 
@@ -1049,7 +1048,7 @@ static int make_status_items(struct audio_file_data *afd,
 	free(status_items);
 	status_items = pb.buf;
 	memset(&pb, 0, sizeof(pb));
-	pb.max_size = SHMMAX - 1;
+	pb.max_size = shm_get_shmmax() - 1;
 	pb.flags = PBF_SIZE_PREFIX;
 	ret = print_list_item(&d, &opts, &pb, current_time);
 	if (ret < 0) {
@@ -1344,7 +1343,7 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 {
 	struct ls_options *opts = query->data;
 	char *p, *pattern_start = (char *)query->data + sizeof(*opts);
-	struct para_buffer b = {.max_size = SHMMAX,
+	struct para_buffer b = {.max_size = shm_get_shmmax(),
 		.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0,
 		.max_size_handler = pass_buffer_as_shm, .private_data = &fd};
 	int i = 0, ret;
@@ -1666,7 +1665,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	char afsi_buf[AFSI_SIZE];
 	uint32_t flags = read_u32(buf + CAB_FLAGS_OFFSET);
 	struct afs_info default_afsi = {.last_played = 0};
-	struct para_buffer msg = {.max_size = SHMMAX,
+	struct para_buffer msg = {.max_size = shm_get_shmmax(),
 		.max_size_handler = pass_buffer_as_shm, .private_data = &fd};
 	uint16_t afhi_offset, chunks_offset;
 
@@ -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;
 }
 
@@ -2081,7 +2080,7 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 {
 	struct touch_action_data tad = {.cto = query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -2227,7 +2226,7 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 {
 	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -2372,7 +2371,7 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 	struct cpsi_action_data cad = {
 		.flags = *(unsigned *)query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -2544,7 +2543,7 @@ static int check_audio_file(struct osl_row *row, void *data)
 void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
-		.max_size = SHMMAX,
+		.max_size = shm_get_shmmax(),
 		.private_data = &fd,
 		.max_size_handler = pass_buffer_as_shm
 	};
@@ -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;
 }
 
 /**