Merge pull request #3876 from qlyoung/fmt-fixes

style fixes...
This commit is contained in:
Mark Stapp 2019-02-28 15:16:16 -05:00 committed by GitHub
commit fd2d11fb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions

View File

@ -3283,7 +3283,7 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id,
extra = bgp_path_info_extra_get(pi);
if (extra->label != label) {
memcpy(&extra->label, label,
num_labels * sizeof(mpls_label_t));
num_labels * sizeof(mpls_label_t));
extra->num_labels = num_labels;
}
if (!(afi == AFI_L2VPN && safi == SAFI_EVPN))
@ -3455,7 +3455,8 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id,
if (has_valid_label) {
extra = bgp_path_info_extra_get(new);
if (extra->label != label) {
memcpy(&extra->label, label, num_labels * sizeof(mpls_label_t));
memcpy(&extra->label, label,
num_labels * sizeof(mpls_label_t));
extra->num_labels = num_labels;
}
if (!(afi == AFI_L2VPN && safi == SAFI_EVPN))

View File

@ -7090,9 +7090,10 @@ void zebra_vxlan_print_vnis_detail(struct vty *vty, struct zebra_vrf *zvrf,
zes.zvrf = zvrf;
/* Display all L2-VNIs */
hash_iterate(zvrf->vni_table, (void (*)(struct hash_bucket *,
void *))zvni_print_hash_detail,
&zes);
hash_iterate(
zvrf->vni_table,
(void (*)(struct hash_bucket *, void *))zvni_print_hash_detail,
&zes);
/* Display all L3-VNIs */
hash_iterate(zrouter.l3vni_table,
@ -7101,8 +7102,9 @@ void zebra_vxlan_print_vnis_detail(struct vty *vty, struct zebra_vrf *zvrf,
&zes);
if (use_json) {
vty_out(vty, "%s\n", json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
}