diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 56cdae0fa..227c738a2 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2879,7 +2879,7 @@ void subgroup_process_announce_selected(struct update_subgroup *subgrp,
 	struct peer *onlypeer;
 	afi_t afi;
 	safi_t safi;
-	struct attr attr = { 0 }, *pattr = &attr;
+	struct attr attr = {0}, *pattr = &attr;
 	struct bgp *bgp;
 	bool advertise;
 
@@ -2916,10 +2916,9 @@ void subgroup_process_announce_selected(struct update_subgroup *subgrp,
 			 */
 			if (advertise) {
 				if (!bgp_check_withdrawal(bgp, dest)) {
-					if (!bgp_adj_out_set_subgroup(dest,
-								      subgrp,
-								      pattr,
-								      selected))
+					if (!bgp_adj_out_set_subgroup(
+						    dest, subgrp, pattr,
+						    selected))
 						bgp_attr_flush(pattr);
 				} else {
 					bgp_adj_out_unset_subgroup(
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index baf86908b..ab030bfa9 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -813,7 +813,7 @@ void subgroup_announce_route(struct update_subgroup *subgrp)
 void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
 {
 	struct bgp *bgp;
-	struct attr attr = { 0 };
+	struct attr attr = {0};
 	struct attr *new_attr = &attr;
 	struct aspath *aspath;
 	struct prefix p;
@@ -957,13 +957,12 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
 				if (!CHECK_FLAG(pi->flags, BGP_PATH_SELECTED))
 					continue;
 
-				if (subgroup_announce_check(dest, pi, subgrp,
-							    bgp_dest_get_prefix(
-								    dest),
-							    &attr, NULL)) {
-					if (!bgp_adj_out_set_subgroup(dest,
-								      subgrp,
-								      &attr, pi))
+				if (subgroup_announce_check(
+					    dest, pi, subgrp,
+					    bgp_dest_get_prefix(dest), &attr,
+					    NULL)) {
+					if (!bgp_adj_out_set_subgroup(
+						    dest, subgrp, &attr, pi))
 						bgp_attr_flush(&attr);
 				} else
 					bgp_attr_flush(&attr);