X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=bd94fcd9dedb8481185b79320919bce7ede63c70;hb=cc210cce03c6e9bd4473159dc8cbcc95f24bfba4;hp=56838e822112c422ff3ec78da25d0d7b7dcaf033;hpb=8bbbc7f397b5068407928bd594a2dea921b8410e;p=paraslash.git

diff --git a/play.c b/play.c
index 56838e82..bd94fcd9 100644
--- a/play.c
+++ b/play.c
@@ -1,14 +1,9 @@
-/*
- * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file play.c Paraslash's standalone player. */
 
 #include <regex.h>
 #include <signal.h>
-#include <inttypes.h>
 #include <lopsub.h>
 
 #include "recv_cmd.lsg.h"
@@ -86,7 +81,7 @@ struct play_task {
 	struct filter_node fn;
 	struct writer_node wn;
 
-	/* See comment to enum state_change_request_type above */
+	/* See comment to enum \ref state_change_request_type above. */
 	enum state_change_request_type rq;
 	/* only relevant if rq == CRT_FILE_CHANGE */
 	unsigned next_file;
@@ -183,7 +178,7 @@ static void parse_config_or_die(int argc, char *argv[])
 		if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
 			goto free_cf;
 		ret = 0;
-		goto free_cf;
+		goto check_arg_count;
 	}
 	ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
 	para_munmap(map, sz);
@@ -201,7 +196,7 @@ static void parse_config_or_die(int argc, char *argv[])
 	lls_free_parse_result(play_lpr, cmd);
 	play_lpr = merged_lpr;
 	loglevel = OPT_UINT32_VAL(LOGLEVEL);
-
+check_arg_count:
 	ret = lls(lls_check_arg_count(play_lpr, 1, INT_MAX, &errctx));
 	if (ret < 0)
 		goto free_cf;
@@ -719,7 +714,6 @@ static void help_completer(struct i9e_completion_info *ci,
 	result->matches = i9e_complete_commands(ci->word, pp_completers);
 }
 
-I9E_DUMMY_COMPLETER(SUPERCOMMAND_UNAVAILABLE);
 static struct i9e_completer pp_completers[] = {
 #define LSG_PLAY_CMD_CMD(_name) {.name = #_name, \
 	.completer = _name ## _completer}