Merge branch 'master' into next

[adu.git] / interactive.c

diff --git a/interactive.c b/interactive.c
index 7aef9e24df8611cd2de0af5dda187e36c2bc5386..0ed0d8234c06c56c4f217a52d7ddb881d83ad8b7 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -146,7 +146,7 @@ static int icom_set(char *line)
 
 static int exec_interactive_command(char *line)
 {
-       const char const *delim = "\t\n\f\r\v ";
+       const char *delim = "\t\n\f\r\v ";
        int i;
        char *cmd, *args;
        int ret = -E_SYNTAX;
@@ -219,7 +219,7 @@ out:
 int com_interactive(void)
 {
        char line[255];
-       int ret = 1;
+       int ret;
 
        select_cmdline_parser_init(&select_conf);
        ret = parse_select_options(NULL, NULL, &admissible_uids, &fi);