Re: [PATCH iproute2-next master v2] bridge: fdb show: fix fdb entry state output (+ add json support)

[Julien Fortin]

On Mon, Jul 27, 2020 at 6:30 PM Stephen Hemminger
<step...@networkplumber.org> wrote:
>
> On Mon, 27 Jul 2020 18:20:09 +0200
> Julien Fortin <jul...@cumulusnetworks.com> wrote:
>
> > diff --git a/bridge/fdb.c b/bridge/fdb.c
> > index d1f8afbe..765f4e51 100644
> > --- a/bridge/fdb.c
> > +++ b/bridge/fdb.c
> > @@ -62,7 +62,10 @@ static const char *state_n2a(unsigned int s)
> >       if (s & NUD_REACHABLE)
> >               return "";
> >
> > -     sprintf(buf, "state=%#x", s);
> > +     if (is_json_context())
> > +             sprintf(buf, "%#x", s);
> > +     else
> > +             sprintf(buf, "state %#x", s)
>
> Please keep the "state=%#x" for the non JSON case.
> No need to change output format.

My v1 patch (see below) kept the "state=" but you asked me to remove
it and re-submit.

diff --git a/bridge/fdb.c b/bridge/fdb.c
index d2247e80..198c51d1 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -62,7 +62,10 @@ static const char *state_n2a(unsigned int s)
        if (s & NUD_REACHABLE)
                return "";

-       sprintf(buf, "state=%#x", s);
+       if (is_json_context())
+               sprintf(buf, "%#x", s);
+       else
+               sprintf(buf, "state=%#x", s);
        return buf;
 }