* [PATCH] m_ife: Remove unused value
@ 2024-04-17 17:07 Maks Mishin
[not found] ` <CAEh9MGTwqGVpuq8M+So8bfU2y=bpbQMJjPJo3F52MjFHQ_BiRQ@mail.gmail.com>
0 siblings, 1 reply; 5+ messages in thread
From: Maks Mishin @ 2024-04-17 17:07 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Maks Mishin, netdev
The variable `has_optional` do not used after set the value.
Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
---
tc/m_ife.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
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);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] m_ife: Remove unused value
@ 2024-02-18 19:44 Maks Mishin
2024-02-19 17:59 ` Stephen Hemminger
0 siblings, 1 reply; 5+ messages in thread
From: Maks Mishin @ 2024-02-18 19:44 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Maks Mishin, netdev
The variable `has_optional` do not used after set the value.
Found by RASU JSC.
Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
---
tc/m_ife.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tc/m_ife.c b/tc/m_ife.c
index 162607ce..42621bec 100644
--- a/tc/m_ife.c
+++ b/tc/m_ife.c
@@ -291,7 +291,6 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
}
if (tb[TCA_IFE_DMAC]) {
- has_optional = 1;
print_string(PRINT_ANY, "dst", "dst %s ",
ll_addr_n2a(RTA_DATA(tb[TCA_IFE_DMAC]),
RTA_PAYLOAD(tb[TCA_IFE_DMAC]), 0, b2,
@@ -299,7 +298,6 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
}
if (tb[TCA_IFE_SMAC]) {
- has_optional = 1;
print_string(PRINT_ANY, "src", "src %s ",
ll_addr_n2a(RTA_DATA(tb[TCA_IFE_SMAC]),
RTA_PAYLOAD(tb[TCA_IFE_SMAC]), 0, b2,
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] m_ife: Remove unused value
2024-02-18 19:44 Maks Mishin
@ 2024-02-19 17:59 ` Stephen Hemminger
2024-02-20 14:32 ` Jamal Hadi Salim
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Hemminger @ 2024-02-19 17:59 UTC (permalink / raw)
To: Maks Mishin; +Cc: netdev, Jamal Hadi Salim
On Sun, 18 Feb 2024 22:44:13 +0300
Maks Mishin <maks.mishinfz@gmail.com> wrote:
> The variable `has_optional` do not used after set the value.
> Found by RASU JSC.
>
> Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
Yes, it is set after used.
The flag should be removed all together and fold the newline into
previous clause?
And since the if clauses are now single statement, the code style
from checkpatch wants braces to be removed.
Something like this:
diff --git a/tc/m_ife.c b/tc/m_ife.c
index 162607ce7415..fce5af784e39 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,12 +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];
@@ -290,21 +286,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);
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] m_ife: Remove unused value
2024-02-19 17:59 ` Stephen Hemminger
@ 2024-02-20 14:32 ` Jamal Hadi Salim
0 siblings, 0 replies; 5+ messages in thread
From: Jamal Hadi Salim @ 2024-02-20 14:32 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Maks Mishin, netdev, Jamal Hadi Salim
On Mon, Feb 19, 2024 at 12:59 PM Stephen Hemminger
<stephen@networkplumber.org> wrote:
>
> On Sun, 18 Feb 2024 22:44:13 +0300
> Maks Mishin <maks.mishinfz@gmail.com> wrote:
>
> > The variable `has_optional` do not used after set the value.
> > Found by RASU JSC.
> >
> > Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
>
> Yes, it is set after used.
> The flag should be removed all together and fold the newline into
> previous clause?
>
> And since the if clauses are now single statement, the code style
> from checkpatch wants braces to be removed.
>
>
> Something like this:
>
Yes, this looks better.
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
cheers,
jamal
> diff --git a/tc/m_ife.c b/tc/m_ife.c
> index 162607ce7415..fce5af784e39 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,12 +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];
> @@ -290,21 +286,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);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-17 22:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-17 17:07 [PATCH] m_ife: Remove unused value Maks Mishin
[not found] ` <CAEh9MGTwqGVpuq8M+So8bfU2y=bpbQMJjPJo3F52MjFHQ_BiRQ@mail.gmail.com>
2024-04-17 22:30 ` Stephen Hemminger
-- strict thread matches above, loose matches on Subject: below --
2024-02-18 19:44 Maks Mishin
2024-02-19 17:59 ` Stephen Hemminger
2024-02-20 14:32 ` Jamal Hadi Salim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).