*: Add RMAP_COMPILE_SUCCESS to enum

Add the RMAP_COMPILE_SUCCESS and switch over to using it.
Refactoring allows a removal of a if statement to just
use the switch statement already in place.  Additionally
the reworking cleans up memory freeing in a couple of spots.
In one spot we no longer will leak memory too.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

1 files changed, 54 insertions, 43 deletions

diff --git a/eigrpd/eigrp_routemap.c b/eigrpd/eigrp_routemap.c
index b645ed1987..360e28adf7 100644
--- a/eigrpd/eigrp_routemap.c
+++ b/eigrpd/eigrp_routemap.c
@@ -137,16 +137,19 @@ static int eigrp_route_match_add(struct vty *vty, struct route_map_index *index,
 {
 	int ret;
 	ret = route_map_add_match(index, command, arg);
-	if (ret) {
-		switch (ret) {
-		case RMAP_RULE_MISSING:
-			vty_out(vty, "%% Can't find rule.\n");
-			return CMD_WARNING_CONFIG_FAILED;
-		case RMAP_COMPILE_ERROR:
-			vty_out(vty, "%% Argument is malformed.\n");
-			return CMD_WARNING_CONFIG_FAILED;
-		}
+	switch (ret) {
+	case RMAP_RULE_MISSING:
+		vty_out(vty, "%% Can't find rule.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_ERROR:
+		vty_out(vty, "%% Argument is malformed.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_SUCCESS:
+		break;
 	}
+
 	return CMD_SUCCESS;
 }
 
@@ -157,16 +160,19 @@ static int eigrp_route_match_delete(struct vty *vty,
 {
 	int ret;
 	ret = route_map_delete_match(index, command, arg);
-	if (ret) {
-		switch (ret) {
-		case RMAP_RULE_MISSING:
-			vty_out(vty, "%% Can't find rule.\n");
-			return CMD_WARNING_CONFIG_FAILED;
-		case RMAP_COMPILE_ERROR:
-			vty_out(vty, "%% Argument is malformed.\n");
-			return CMD_WARNING_CONFIG_FAILED;
-		}
+	switch (ret) {
+	case RMAP_RULE_MISSING:
+		vty_out(vty, "%% Can't find rule.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_ERROR:
+		vty_out(vty, "%% Argument is malformed.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_SUCCESS:
+		break;
 	}
+
 	return CMD_SUCCESS;
 }
 
@@ -177,25 +183,27 @@ static int eigrp_route_set_add(struct vty *vty, struct route_map_index *index,
 	int ret;
 
 	ret = route_map_add_set(index, command, arg);
-	if (ret) {
-		switch (ret) {
-		case RMAP_RULE_MISSING:
-			vty_out(vty, "%% Can't find rule.\n");
+	switch (ret) {
+	case RMAP_RULE_MISSING:
+		vty_out(vty, "%% Can't find rule.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_ERROR:
+		/*
+		 * rip, ripng and other protocols share the set metric command
+		 * but only values from 0 to 16 are valid for rip and ripng
+		 * if metric is out of range for rip and ripng, it is
+		 * not for other protocols. Do not return an error
+		 */
+		if (strcmp(command, "metric")) {
+			vty_out(vty, "%% Argument is malformed.\n");
 			return CMD_WARNING_CONFIG_FAILED;
-		case RMAP_COMPILE_ERROR:
-			/* rip, ripng and other protocols share the set metric
-			   command
-			   but only values from 0 to 16 are valid for rip and
-			   ripng
-			   if metric is out of range for rip and ripng, it is
-			   not for
-			   other protocols. Do not return an error */
-			if (strcmp(command, "metric")) {
-				vty_out(vty, "%% Argument is malformed.\n");
-				return CMD_WARNING_CONFIG_FAILED;
-			}
 		}
+		break;
+	case RMAP_COMPILE_SUCCESS:
+		break;
 	}
+
 	return CMD_SUCCESS;
 }
 
@@ -207,16 +215,19 @@ static int eigrp_route_set_delete(struct vty *vty,
 	int ret;
 
 	ret = route_map_delete_set(index, command, arg);
-	if (ret) {
-		switch (ret) {
-		case RMAP_RULE_MISSING:
-			vty_out(vty, "%% Can't find rule.\n");
-			return CMD_WARNING_CONFIG_FAILED;
-		case RMAP_COMPILE_ERROR:
-			vty_out(vty, "%% Argument is malformed.\n");
-			return CMD_WARNING_CONFIG_FAILED;
-		}
+	switch (ret) {
+	case RMAP_RULE_MISSING:
+		vty_out(vty, "%% Can't find rule.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_ERROR:
+		vty_out(vty, "%% Argument is malformed.\n");
+		return CMD_WARNING_CONFIG_FAILED;
+		break;
+	case RMAP_COMPILE_SUCCESS:
+		break;
 	}
+
 	return CMD_SUCCESS;
 }