void ospf_route_free(struct ospf_route * or)
{
if (or->paths)
- list_delete_and_null(& or->paths);
+ list_delete(& or->paths);
XFREE(MTYPE_OSPF_ROUTE, or);
}
/* Check each path. */
for (n1 = listhead(or->paths),
n2 = listhead(newor->paths);
- n1 && n2;
- n1 = listnextnode(n1), n2 = listnextnode(n2)) {
+ n1 && n2; n1 = listnextnode_unchecked(n1),
+ n2 = listnextnode_unchecked(n2)) {
op = listgetdata(n1);
newop = listgetdata(n2);
struct vertex *v, struct ospf_area *area,
int parent_is_root, int lsa_pos)
{
- u_int32_t cost;
+ uint32_t cost;
struct route_node *rn;
struct ospf_route * or ;
struct prefix_ipv4 p;
static int ospf_asbr_route_cmp(struct ospf *ospf, struct ospf_route *r1,
struct ospf_route *r2)
{
- u_char r1_type, r2_type;
+ uint8_t r1_type, r2_type;
r1_type = r1->path_type;
r2_type = r2->path_type;
zlog_debug("Pruning router node %s",
inet_ntoa(rn->p.u.prefix4));
- list_delete_and_null(&paths);
+ list_delete(&paths);
rn->info = NULL;
route_unlock_node(rn);
}