m_ife: Remove unused value

Commit Message

Maks Mishin April 17, 2024, 5:07 p.m. UTC

The variable `has_optional` do not used after set the value.

Signed-off-by: Maks Mishin <[e-mail]>
---
 tc/m_ife.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Comments

Stephen Hemminger April 17, 2024, 10:30 p.m. UTC | #1

On Wed, 17 Apr 2024 20:08:55 +0300
Maks Mishin <[e-mail]> wrote:

> >                 ife_type = rta_getattr_u16(tb[TCA_IFE_TYPE]);
> > -               has_optional = 1;
> >                 print_0xhex(PRINT_ANY, "type", "type %#llX ", ife_type);
> >         }
> >
> > -       if (has_optional)
> > -               print_string(PRINT_FP, NULL, "%s\t", _SL_);
> > -

It is used. The printout would change with your patch. It would cause more
things to be one line.

The lower two has_optional parts have no effect and could be removed.

But before removing them, it would to look back in older versions
of iproute2 before JSON was introduced to see if this was something
that got mangled then.

Patch

diff --git a/tc/m_ife.c b/tc/m_ife.c
index 162607ce..f8a5e427 100644
--- a/tc/m_ife.c
+++ b/tc/m_ife.c
@@ -219,7 +219,6 @@  static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
 	__u32 mmark = 0;
 	__u16 mtcindex = 0;
 	__u32 mprio = 0;
-	int has_optional = 0;
 	SPRINT_BUF(b2);
 
 	print_string(PRINT_ANY, "kind", "%s ", "ife");
@@ -240,13 +239,9 @@  static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
 
 	if (tb[TCA_IFE_TYPE]) {
 		ife_type = rta_getattr_u16(tb[TCA_IFE_TYPE]);
-		has_optional = 1;
 		print_0xhex(PRINT_ANY, "type", "type %#llX ", ife_type);
 	}
 
-	if (has_optional)
-		print_string(PRINT_FP, NULL, "%s\t", _SL_);
-
 	if (tb[TCA_IFE_METALST]) {
 		struct rtattr *metalist[IFE_META_MAX + 1];
 		int len = 0;
@@ -290,21 +285,17 @@  static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
 
 	}
 
-	if (tb[TCA_IFE_DMAC]) {
-		has_optional = 1;
+	if (tb[TCA_IFE_DMAC])
 		print_string(PRINT_ANY, "dst", "dst %s ",
 			     ll_addr_n2a(RTA_DATA(tb[TCA_IFE_DMAC]),
 					 RTA_PAYLOAD(tb[TCA_IFE_DMAC]), 0, b2,
 					 sizeof(b2)));
-	}
 
-	if (tb[TCA_IFE_SMAC]) {
-		has_optional = 1;
+	if (tb[TCA_IFE_SMAC])
 		print_string(PRINT_ANY, "src", "src %s ",
 			     ll_addr_n2a(RTA_DATA(tb[TCA_IFE_SMAC]),
 					 RTA_PAYLOAD(tb[TCA_IFE_SMAC]), 0, b2,
 					 sizeof(b2)));
-	}
 
 	print_nl();
 	print_uint(PRINT_ANY, "index", "\t index %u", p->index);