]> git.puffer.fish Git - mirror/frr.git/commitdiff
ripd, ripngd: fix OpenBSD compiler warning
authorDavid Lamparter <equinox@diac24.net>
Wed, 12 Jun 2019 18:39:46 +0000 (20:39 +0200)
committerDavid Lamparter <equinox@diac24.net>
Thu, 13 Jun 2019 11:35:33 +0000 (13:35 +0200)
The fact that the OpenBSD RB_TREE stuff results in a compiler warning on
OpenBSD - and OpenBSD alone - is pretty funny, I have to say...

Signed-off-by: David Lamparter <equinox@diac24.net>
ripd/rip_northbound.c
ripngd/ripng_northbound.c

index e0ddb9c46882d69e86c91394c052e71900db17db..f8a7f5dc678d9ccd5da8c9a13c8a3f645bdb33fe 100644 (file)
@@ -103,12 +103,12 @@ static int ripd_instance_destroy(enum nb_event event,
 static const void *ripd_instance_get_next(const void *parent_list_entry,
                                          const void *list_entry)
 {
-       const struct rip *rip = list_entry;
+       struct rip *rip = (struct rip *)list_entry;
 
        if (list_entry == NULL)
                rip = RB_MIN(rip_instance_head, &rip_instances);
        else
-               rip = RB_NEXT(rip_instance_head, (struct rip *)rip);
+               rip = RB_NEXT(rip_instance_head, rip);
 
        return rip;
 }
index cbf62c53ff9c1208d51f2912673e6cdb9ebdcfbc..588f6db037dc96e00f7bd0d286a71874bd7ba4c3 100644 (file)
@@ -105,12 +105,12 @@ static int ripngd_instance_destroy(enum nb_event event,
 static const void *ripngd_instance_get_next(const void *parent_list_entry,
                                            const void *list_entry)
 {
-       const struct ripng *ripng = list_entry;
+       struct ripng *ripng = (struct ripng *)list_entry;
 
        if (list_entry == NULL)
                ripng = RB_MIN(ripng_instance_head, &ripng_instances);
        else
-               ripng = RB_NEXT(ripng_instance_head, (struct ripng *)ripng);
+               ripng = RB_NEXT(ripng_instance_head, ripng);
 
        return ripng;
 }