Revert of PR 4078 and PR 4315

Signed-off-by: Lakshman Krishnamoorthy <lkrishnamoor@vmware.com>

1 files changed, 27 insertions, 24 deletions

diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index 3c1c779bad..3216b8f89f 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -42,9 +42,10 @@ struct rip_metric_modifier {
 
 /* `match metric METRIC' */
 /* Match function return 1 if match is success else return zero. */
-static enum route_map_match_result_t
-route_match_metric(void *rule, const struct prefix *prefix,
-		   route_map_object_t type, void *object)
+static route_map_result_t route_match_metric(void *rule,
+					     const struct prefix *prefix,
+					     route_map_object_t type,
+					     void *object)
 {
 	uint32_t *metric;
 	uint32_t check;
@@ -94,9 +95,10 @@ struct route_map_rule_cmd route_match_metric_cmd = {
 
 /* `match interface IFNAME' */
 /* Match function return 1 if match is success else return zero. */
-static enum route_map_match_result_t
-route_match_interface(void *rule, const struct prefix *prefix,
-		      route_map_object_t type, void *object)
+static route_map_result_t route_match_interface(void *rule,
+						const struct prefix *prefix,
+						route_map_object_t type,
+						void *object)
 {
 	struct rip_info *rinfo;
 	struct interface *ifp;
@@ -141,9 +143,10 @@ struct route_map_rule_cmd route_match_interface_cmd = {
 /* `match ip next-hop IP_ACCESS_LIST' */
 
 /* Match function return 1 if match is success else return zero. */
-static enum route_map_match_result_t
-route_match_ip_next_hop(void *rule, const struct prefix *prefix,
-			route_map_object_t type, void *object)
+static route_map_result_t route_match_ip_next_hop(void *rule,
+						  const struct prefix *prefix,
+						  route_map_object_t type,
+						  void *object)
 {
 	struct access_list *alist;
 	struct rip_info *rinfo;
@@ -187,7 +190,7 @@ static struct route_map_rule_cmd route_match_ip_next_hop_cmd = {
 
 /* `match ip next-hop prefix-list PREFIX_LIST' */
 
-static enum route_map_match_result_t
+static route_map_result_t
 route_match_ip_next_hop_prefix_list(void *rule, const struct prefix *prefix,
 				    route_map_object_t type, void *object)
 {
@@ -232,9 +235,10 @@ static struct route_map_rule_cmd route_match_ip_next_hop_prefix_list_cmd = {
 
 /* Match function should return 1 if match is success else return
    zero. */
-static enum route_map_match_result_t
-route_match_ip_address(void *rule, const struct prefix *prefix,
-		       route_map_object_t type, void *object)
+static route_map_result_t route_match_ip_address(void *rule,
+						 const struct prefix *prefix,
+						 route_map_object_t type,
+						 void *object)
 {
 	struct access_list *alist;
 
@@ -270,7 +274,7 @@ static struct route_map_rule_cmd route_match_ip_address_cmd = {
 
 /* `match ip address prefix-list PREFIX_LIST' */
 
-static enum route_map_match_result_t
+static route_map_result_t
 route_match_ip_address_prefix_list(void *rule, const struct prefix *prefix,
 				   route_map_object_t type, void *object)
 {
@@ -305,9 +309,8 @@ static struct route_map_rule_cmd route_match_ip_address_prefix_list_cmd = {
 
 /* `match tag TAG' */
 /* Match function return 1 if match is success else return zero. */
-static enum route_map_match_result_t
-route_match_tag(void *rule, const struct prefix *p, route_map_object_t type,
-		void *object)
+static route_map_result_t route_match_tag(void *rule, const struct prefix *p,
+					  route_map_object_t type, void *object)
 {
 	route_tag_t *tag;
 	struct rip_info *rinfo;
@@ -336,9 +339,10 @@ static struct route_map_rule_cmd route_match_tag_cmd = {
 /* `set metric METRIC' */
 
 /* Set metric to attribute. */
-static enum route_map_match_result_t
-route_set_metric(void *rule, const struct prefix *prefix,
-		 route_map_object_t type, void *object)
+static route_map_result_t route_set_metric(void *rule,
+					   const struct prefix *prefix,
+					   route_map_object_t type,
+					   void *object)
 {
 	if (type == RMAP_RIP) {
 		struct rip_metric_modifier *mod;
@@ -434,7 +438,7 @@ static struct route_map_rule_cmd route_set_metric_cmd = {
 /* `set ip next-hop IP_ADDRESS' */
 
 /* Set nexthop to object.  ojbect must be pointer to struct attr. */
-static enum route_map_match_result_t route_set_ip_nexthop(void *rule,
+static route_map_result_t route_set_ip_nexthop(void *rule,
 					       const struct prefix *prefix,
 					       route_map_object_t type,
 					       void *object)
@@ -487,9 +491,8 @@ static struct route_map_rule_cmd route_set_ip_nexthop_cmd = {
 /* `set tag TAG' */
 
 /* Set tag to object.  ojbect must be pointer to struct attr. */
-static enum route_map_match_result_t
-route_set_tag(void *rule, const struct prefix *prefix, route_map_object_t type,
-	      void *object)
+static route_map_result_t route_set_tag(void *rule, const struct prefix *prefix,
+					route_map_object_t type, void *object)
 {
 	route_tag_t *tag;
 	struct rip_info *rinfo;