[ekg2-commit] r4084 - trunk/ekg: trunk/ekg/commands.c

[SVN commit]

Author: wiechu
Date: 2008-07-09 18:20:08 +0200 (Wed, 09 Jul 2008)
New Revision: 4084

Modified:
   trunk/ekg/commands.c
Log:
    cmd_alias() -- code cleaninig

Modified: trunk/ekg/commands.c
===================================================================
--- trunk/ekg/commands.c	2008-07-09 15:44:43 UTC (rev 4083)
+++ trunk/ekg/commands.c	2008-07-09 16:20:08 UTC (rev 4084)
@@ -373,62 +373,14 @@
 
 static COMMAND(cmd_alias)
 {
-	if (match_arg(params[0], 'a', ("add"), 2)) {
-		if (!params[1] || !xstrchr(params[1], ' ')) {
-			printq("not_enough_params", name);
-			return -1;
-		}
+	int ok = 0;
 
-		if (!alias_add(params[1], quiet, 0)) {
-			config_changed = 1;
-			return 0;
-		}
-
-		return -1;
-	}
-
-	if (match_arg(params[0], 'A', ("append"), 2)) {
-		if (!params[1] || !xstrchr(params[1], ' ')) {
-			printq("not_enough_params", name);
-			return -1;
-		}
-
-		if (!alias_add(params[1], quiet, 1)) {
-			config_changed = 1;
-			return 0;
-		}
-
-		return -1;
-	}
-
-	if (match_arg(params[0], 'd', ("del"), 2)) {
-		int ret;
-
-		if (!params[1]) {
-			printq("not_enough_params", name);
-			return -1;
-		}
-
-		if (!xstrcmp(params[1], "*"))
-			ret = alias_remove(NULL, quiet);
-		else {
-			ret = alias_remove(params[1], quiet);
-		}
-
-		if (!ret) {
-			config_changed = 1;
-			return 0;
-		}
-
-		return -1;
-	}
-	
 	if (!params[0] || match_arg(params[0], 'l', ("list"), 2) || params[0][0] != '-') {
 		alias_t *a;
 		int count = 0;
 		const char *aname = NULL;
 
-		if (params[0] && match_arg(params[0], 'l', ("list"), 2))
+		if (match_arg(params[0], 'l', ("list"), 2))
 			aname = params[1];
 		else if (params[0])
 			aname = params[0];
@@ -466,8 +418,28 @@
 		return 0;
 	}
 
-	printq("invalid_params", name);
+	if (!params[1] || !xstrchr(params[1], ' ')) {
+		printq("not_enough_params", name);
+		return -1;
+	}
 
+	if (match_arg(params[0], 'a', ("add"), 2)) {
+		ok = !alias_add(params[1], quiet, 0);
+	} else if (match_arg(params[0], 'A', ("append"), 2)) {
+		ok = !alias_add(params[1], quiet, 1);
+	} if (match_arg(params[0], 'd', ("del"), 2)) {
+		if (!xstrcmp(params[1], "*"))
+			ok = !alias_remove(NULL, quiet);
+		else
+			ok = !alias_remove(params[1], quiet);
+	} else
+		printq("invalid_params", name);
+
+	if (ok) {
+		config_changed = 1;
+		return 0;
+	}
+
 	return -1;
 }