X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=5e66607e4dba4a0595da7f8fcfeae0dba0bf3bad;hp=cea21cb3f5e182798f922b8234aa49977c85ba6b;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=1775d4d4147730e79e48aa941aee88580b8beb08

diff --git a/file_write.c b/file_write.c
index cea21cb3..5e66607e 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -39,7 +39,7 @@ __must_check __malloc static char *random_filename(void)
 	char *result, *home = para_homedir();
 
 	srandom(clock_get_realtime(NULL)->tv_usec);
-	result = make_message("%s/.paraslash/%08lu", home,
+	result = make_message("%s/.paraslash/%08ld", home,
 		para_random(99999999));
 	free(home);
 	return result;
@@ -74,9 +74,9 @@ out:
 	return ret;
 }
 
-static void file_write_pre_select(struct sched *s, struct task *t)
+static void file_write_pre_select(struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_file_write_data *pfwd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -97,17 +97,16 @@ static void file_write_close(struct writer_node *wn)
 	free(pfwd);
 }
 
-static int file_write_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int file_write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_file_write_data *pfwd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	int ret;
 	char *buf;
 	size_t bytes;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(wn->task);
 	if (ret < 0)
 		goto out;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
@@ -157,9 +156,6 @@ void file_write_init(struct writer *w)
 	w->parse_config_or_die = file_write_parse_config_or_die;
 	w->free_config = file_write_free_config;
 	w->close = file_write_close;
-	w->help = (struct ggo_help) {
-		.short_help = file_write_args_info_help,
-		.detailed_help = file_write_args_info_detailed_help
-	};
+	w->help = (struct ggo_help)DEFINE_GGO_HELP(file_write);
 	file_write_cmdline_parser_free(&dummy);
 }