From 608c62b3967882d31ff9edde97e38de0fcff154b Mon Sep 17 00:00:00 2001
From: Petr Vorel <[email protected]>
Date: Wed, 24 May 2023 10:40:23 +0200
Subject: [PATCH 018/135] tracepath: Merge if clauses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge if clauses, because the printed message is the same.
This should have been done in 3337034 ("Initial import of iputils"),
but 2ca0f7d made it even worse when remove else from else if
(clang-tidy was obviously wrong :)).

Fixes: 2ca0f7d ("[clang-tidy] fix identical branches")
Reviewed-by: Marek Küthe <[email protected]>
Signed-off-by: Petr Vorel <[email protected]>
Reference: https://github.com/iputils/iputils/commit/608c62b3967882d31ff9edde97e38de0fcff154b
---
 tracepath.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tracepath.c b/tracepath.c
index ebb7f72..04d77b8 100644
--- a/tracepath.c
+++ b/tracepath.c
@@ -321,10 +321,8 @@ static int recverr(struct run_state *const ctl)
 		     e->ee_type == ICMPV6_TIME_EXCEED &&
 		     e->ee_code == ICMPV6_EXC_HOPLIMIT)) {
 			if (rethops >= 0) {
-				if (sndhops >= 0 && rethops != sndhops)
-					printf(_("asymm %2d "), rethops);
-
-				if (sndhops < 0 && rethops != ctl->ttl)
+				if ((sndhops >= 0 && rethops != sndhops) ||
+					(sndhops < 0 && rethops != ctl->ttl))
 					printf(_("asymm %2d "), rethops);
 			}
 			printf("\n");
-- 
2.33.0