Commit 2151003e authored by Donald Hunter's avatar Donald Hunter Committed by Jakub Kicinski
Browse files

tools/net/ynl: remove extraneous plural from variable names 



_decode_array_attr() uses variable subattrs in every branch when only
one branch decodes more than a single attribute.

Change the variable name to subattr in the branches that only decode a
single attribute so that the intent is more obvious.

Signed-off-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20250211120127.84858-2-donald.hunter@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 443b5ca4

tools/net/ynl/pyynl/lib/ynl.py

+6 −6
Original line number Diff line number Diff line
@@ -644,15 +644,15 @@ class YnlFamily(SpecFamily): 
                subattrs = self._decode(NlAttrs(item.raw), attr_spec['nested-attributes'])

                decoded.append({ item.type: subattrs })

            elif attr_spec["sub-type"] == 'binary':

                subattrs = item.as_bin()

                subattr = item.as_bin()

                if attr_spec.display_hint:

                    subattrs = self._formatted_string(subattrs, attr_spec.display_hint)

                decoded.append(subattrs)

                    subattr = self._formatted_string(subattr, attr_spec.display_hint)

                decoded.append(subattr)

            elif attr_spec["sub-type"] in NlAttr.type_formats:

                subattrs = item.as_scalar(attr_spec['sub-type'], attr_spec.byte_order)

                subattr = item.as_scalar(attr_spec['sub-type'], attr_spec.byte_order)

                if attr_spec.display_hint:

                    subattrs = self._formatted_string(subattrs, attr_spec.display_hint)

                decoded.append(subattrs)

                    subattr = self._formatted_string(subattr, attr_spec.display_hint)

                decoded.append(subattr)

            else:

                raise Exception(f'Unknown {attr_spec["sub-type"]} with name {attr_spec["name"]}')

        return decoded