From: Ben Pfaff <blp@nicira.com>
Date: Fri, 3 Jun 2011 17:10:41 +0000 (-0700)
Subject: rtnetlink-link: Avoid cast in rtnetlink_link_notifier_register().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9292989d05b1a468d17bce8f6222f5344bab6b03;p=openvswitch

rtnetlink-link: Avoid cast in rtnetlink_link_notifier_register().

It's easy enough to avoid this cast by going through a thunk function.
(The other cast in this function is harder to avoid.)

This is just a cleanup that doesn't fix any actual bug.
---

diff --git a/lib/rtnetlink-link.c b/lib/rtnetlink-link.c
index 09ba954e..98ab3991 100644
--- a/lib/rtnetlink-link.c
+++ b/lib/rtnetlink-link.c
@@ -71,6 +71,12 @@ rtnetlink_link_parse(struct ofpbuf *buf,
     return parsed;
 }
 
+static bool
+rtnetlink_link_parse_cb(struct ofpbuf *buf, void *change)
+{
+    return rtnetlink_link_parse(buf, change);
+}
+
 /* Registers 'cb' to be called with auxiliary data 'aux' with network device
  * change notifications.  The notifier is stored in 'notifier', which the
  * caller must not modify or free.
@@ -84,11 +90,11 @@ int
 rtnetlink_link_notifier_register(struct rtnetlink_notifier *notifier,
                                  rtnetlink_link_notify_func *cb, void *aux)
 {
-    rtnetlink_parse_func *pf  = (rtnetlink_parse_func *) rtnetlink_link_parse;
     rtnetlink_notify_func *nf = (rtnetlink_notify_func *) cb;
 
     if (!rtn) {
-        rtn = rtnetlink_create(RTNLGRP_LINK, pf, &rtn_change);
+        rtn = rtnetlink_create(RTNLGRP_LINK, rtnetlink_link_parse_cb,
+                               &rtn_change);
     }
 
     return rtnetlink_notifier_register(rtn, notifier, nf, aux);