| Message ID | 20231211140732.11475-10-bpoirier@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b627c387eb5c9c8ce37af1fc72fdbc30811fc78d |
| Delegated to: | Stephen Hemminger |
| Headers | show |
| Series | bridge: vni: UI fixes | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Mon, 11 Dec 2023 09:07:21 -0500 Benjamin Poirier <bpoirier@nvidia.com> wrote: > print_vni() is used to output one vni or vni range which, in json output > mode, looks like > { > "vni": 100 > } > > Currently, the closing bracket is handled within the function but the > opening bracket is handled by open_json_object() before calling the > function. For consistency, move the call to open_json_object() within > print_vni(). > > Reviewed-by: Petr Machata <petrm@nvidia.com> > Tested-by: Petr Machata <petrm@nvidia.com> > Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
diff --git a/bridge/vni.c b/bridge/vni.c index 51e65b89..8a6ac245 100644 --- a/bridge/vni.c +++ b/bridge/vni.c @@ -242,6 +242,7 @@ static void print_vni(struct rtattr *t, int ifindex) if (ttb[VXLAN_VNIFILTER_ENTRY_END]) vni_end = rta_getattr_u32(ttb[VXLAN_VNIFILTER_ENTRY_END]); + open_json_object(NULL); if (vni_end) print_range("vni", vni_start, vni_end); else @@ -333,10 +334,8 @@ int print_vnifilter_rtm(struct nlmsghdr *n, void *arg) continue; if (first) { open_vni_port(tmsg->ifindex, "%s"); - open_json_object(NULL); first = false; } else { - open_json_object(NULL); print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", ""); }
print_vni() is used to output one vni or vni range which, in json output mode, looks like { "vni": 100 } Currently, the closing bracket is handled within the function but the opening bracket is handled by open_json_object() before calling the function. For consistency, move the call to open_json_object() within print_vni(). Reviewed-by: Petr Machata <petrm@nvidia.com> Tested-by: Petr Machata <petrm@nvidia.com> Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com> --- bridge/vni.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)