pimd: Fixup some clang compiler warnings

clang run on a fairly recent fedora complains
about some code.  Fixup the warnings.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 6e824a7d3bd73744d7f1d613f53ee45888dd4d44..15489f81fa79e1dde0c9d856243d039a1bcf0ae6 100644 (file)
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -53,7 +53,7 @@
 #define PIM_IF_DONT_IGMP_LISTEN_ALLROUTERS(options) ((options) &= ~PIM_IF_MASK_IGMP_LISTEN_ALLROUTERS)
 #define PIM_IF_DONT_PIM_CAN_DISABLE_JOIN_SUPRESSION(options) ((options) &= ~PIM_IF_MASK_PIM_CAN_DISABLE_JOIN_SUPRESSION)
 
-#define PIM_I_am_DR(pim_ifp) ((pim_ifp)->pim_dr_addr.s_addr == (pim_ifp)->primary_address.s_addr)
+#define PIM_I_am_DR(pim_ifp) (pim_ifp)->pim_dr_addr.s_addr == (pim_ifp)->primary_address.s_addr
 
 enum pim_interface_type {
   PIM_INTERFACE_SSM,

diff --git a/pimd/pimd.h b/pimd/pimd.h
index 2a5cd3953f0df741a375c89fd6c130bbcc243129..7114e07a22c36bb8b190af5d85d6b4733af309c0 100644 (file)
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -50,7 +50,7 @@
 #define PIM_FORCE_BOOLEAN(expr) ((expr) != 0)
 
 #define PIM_NET_INADDR_ANY (htonl(INADDR_ANY))
-#define PIM_INADDR_IS_ANY(addr) ((addr).s_addr == PIM_NET_INADDR_ANY) /* struct in_addr addr */
+#define PIM_INADDR_IS_ANY(addr) (addr).s_addr == PIM_NET_INADDR_ANY
 #define PIM_INADDR_ISNOT_ANY(addr) ((addr).s_addr != PIM_NET_INADDR_ANY) /* struct in_addr addr */
 
 #define PIM_MASK_PIM_EVENTS          (1 << 0)