X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=ccb233180e750b5077ba2cda6d2f622fd2cbad9b;hp=dd723233c75e481f3c0e342c1f4eb993a448c076;hb=c252837b853b35f06fffe637b2a6bf16419da954;hpb=64e19e1bdabc9bb04941f285fb828a8317359816

diff --git a/audiod.c b/audiod.c
index dd723233..ccb23318 100644
--- a/audiod.c
+++ b/audiod.c
@@ -104,18 +104,6 @@ struct command_task {
 	struct task task;
 };
 
-/**
- * task for signal handling
- */
-struct signal_task {
-	/** the signal pipe */
-	int fd;
-	/** the number of the most recent signal */
-	int signum;
-	/** the associated task structure */
-	struct task task;
-};
-
 /** iterate over all supported audio formats */
 #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
 
@@ -497,7 +485,7 @@ out:
 	return count;
 }
 
-static void check_stat_line(char *line)
+static int check_stat_line(char *line, __a_unused void *data)
 {
 	int itemnum;
 	size_t ilen = 0;
@@ -506,14 +494,14 @@ static void check_stat_line(char *line)
 
 //	PARA_INFO_LOG("line: %s\n", line);
 	if (!line)
-		return;
+		return 1;
 	itemnum = stat_line_valid(line);
 	if (itemnum < 0) {
 		PARA_WARNING_LOG("invalid status line: %s\n", line);
-		return;
+		return 1;
 	}
 	if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
-		return;
+		return 1;
 	tmp = make_message("%s\n", line);
 	stat_client_write(tmp, itemnum);
 	free(tmp);
@@ -557,6 +545,7 @@ static void check_stat_line(char *line)
 			stat_task->clock_diff_count--;
 		break;
 	}
+	return 1;
 }
 
 static void try_to_close_slot(int slot_num)
@@ -1068,7 +1057,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
 		return;
 	}
 	bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
-		&check_stat_line);
+		&check_stat_line, NULL);
 	if (st->pcd->loaded != bytes_left) {
 		st->last_status_read = *now;
 		st->pcd->loaded = bytes_left;
@@ -1120,7 +1109,7 @@ static void set_initial_status(void)
  * */
 int main(int argc, char *argv[])
 {
-	char *cf;
+	char *config_file;
 	int ret, i;
 	struct sched s;
 	struct command_task command_task_struct, *cmd_task = &command_task_struct;
@@ -1130,8 +1119,8 @@ int main(int argc, char *argv[])
 	audiod_cmdline_parser(argc, argv, &conf);
 	HANDLE_VERSION_FLAG("audiod", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
-	cf = configfile_exists();
-	if (cf) {
+	config_file = configfile_exists();
+	if (config_file) {
 		struct audiod_cmdline_parser_params params = {
 			.override = 0,
 			.initialize = 0,
@@ -1139,10 +1128,11 @@ int main(int argc, char *argv[])
 			.check_ambiguity = 0
 
 		};
-		if (audiod_cmdline_parser_config_file(cf, &conf, &params)) {
+		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
 			PARA_EMERG_LOG("%s", "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}
+		free(config_file);
 	}
 	if (conf.logfile_given)
 		logfile = open_log(conf.logfile_arg);