From: Manoj Naragund <mnaragund@vmware.com>
Date: Fri, 22 Oct 2021 07:33:10 +0000 (-0700)
Subject: ospf6d: minor code enhancements.
X-Git-Tag: base_8.2~279^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d214b64afa640e63f23b53eb40eda777c84d6556;p=matthieu%2Ffrr.git

ospf6d: minor code enhancements.

Description:
code changes involve removal of increment and decrement operators
during function calls. These expressions make code less readable.

Signed-off-by: Manoj Naragund <mnaragund@vmware.com>
---

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index cd2791fc48..fafe3dc36d 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -1308,7 +1308,8 @@ static void ospf6_asbr_redistribute_set(struct ospf6 *ospf6, int type)
 {
 	ospf6_zebra_redistribute(type, ospf6->vrf_id);
 
-	ospf6_asbr_status_update(ospf6, ++ospf6->redist_count);
+	++ospf6->redist_count;
+	ospf6_asbr_status_update(ospf6, ospf6->redist_count);
 }
 
 static void ospf6_asbr_redistribute_unset(struct ospf6 *ospf6,
@@ -1330,7 +1331,8 @@ static void ospf6_asbr_redistribute_unset(struct ospf6 *ospf6,
 	}
 
 	ospf6_asbr_routemap_unset(red);
-	ospf6_asbr_status_update(ospf6, --ospf6->redist_count);
+	--ospf6->redist_count;
+	ospf6_asbr_status_update(ospf6, ospf6->redist_count);
 }
 
 /* When an area is unstubified, flood all the external LSAs in the area */
diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c
index c2e9b7f28a..c12964ea2f 100644
--- a/ospf6d/ospf6_nssa.c
+++ b/ospf6d/ospf6_nssa.c
@@ -185,12 +185,15 @@ void ospf6_abr_nssa_check_status(struct ospf6 *ospf6)
 		 * when they are not translating.
 		 */
 		if (old_state != area->NSSATranslatorState) {
-			if (old_state == OSPF6_NSSA_TRANSLATE_DISABLED)
+			if (old_state == OSPF6_NSSA_TRANSLATE_DISABLED) {
+				++ospf6->redist_count;
 				ospf6_asbr_status_update(ospf6,
-							 ++ospf6->redist_count);
-			else
+							 ospf6->redist_count);
+			} else {
+				--ospf6->redist_count;
 				ospf6_asbr_status_update(ospf6,
-							 --ospf6->redist_count);
+							 ospf6->redist_count);
+			}
 		}
 	}
 }