TODO: squash

Signed-off-by: Dumitru Ceara <[email protected]>

lib/ovn-util.c

@@ -359,17 +359,17 @@ lrp_network_to_string(const struct lport_addresses *addresses, struct ds *s,
 {
     ds_put_cstr(s, addresses->ea_s);
     for (size_t i = 0; i < addresses->n_ipv4_addrs; i++) {
-        struct ipv4_netaddr addr = addresses->ipv4_addrs[i];
-        ds_put_format(s, " %s/%d", addr.addr_s, addr.plen);
+        struct ipv4_netaddr *addr = &addresses->ipv4_addrs[i];
+        ds_put_format(s, " %s/%d", addr->addr_s, addr->plen);
     }
     for (size_t i = 0; i < addresses->n_ipv6_addrs; i++) {
         /* The generated v6 address is always at the end
          * (see extract_lrp_networks). */
         if (!include_generated_v6 && i == addresses->n_ipv6_addrs -1) {
             break;
         }
-        struct ipv6_netaddr addr = addresses->ipv6_addrs[i];
-        ds_put_format(s, " %s/%d", addr.addr_s, addr.plen);
+        struct ipv6_netaddr *addr = &addresses->ipv6_addrs[i];
+        ds_put_format(s, " %s/%d", addr->addr_s, addr->plen);
     }
 }
 

northd/northd.c

@@ -3142,14 +3142,11 @@ ovn_port_update_sbrec(struct ovsdb_idl_txn *ovnsb_txn,
         sbrec_port_binding_set_parent_port(op->sb, NULL);
         sbrec_port_binding_set_tag(op->sb, NULL, 0);
 
-        const struct lport_addresses *networks;
-        if (op->primary_port) {
-            networks = &op->primary_port->lrp_networks;
-        } else {
-            networks = &op->lrp_networks;
-        }
         struct ds s = DS_EMPTY_INITIALIZER;
-        lrp_network_to_string(networks, &s, false);
+        lrp_network_to_string(op->primary_port
+                              ? &op->primary_port->lrp_networks
+                              : &op->lrp_networks,
+                              &s, false);
         const char *addresses = ds_cstr(&s);
         sbrec_port_binding_set_mac(op->sb, &addresses, 1);
         ds_destroy(&s);