From 6339042cb9c16dcf0efedc382666f4cbff22be18 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Mon, 4 Feb 2019 14:33:06 -0500 Subject: libs: use const in some interface flag accessors Use const in several interface struct flag accessors (that just test flags.) Signed-off-by: Mark Stapp --- lib/if.c | 20 ++++++++++---------- lib/if.h | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/if.c b/lib/if.c index a31b44c7d..0e16a040b 100644 --- a/lib/if.c +++ b/lib/if.c @@ -436,13 +436,13 @@ void if_set_index(struct interface *ifp, ifindex_t ifindex) } /* Does interface up ? */ -int if_is_up(struct interface *ifp) +int if_is_up(const struct interface *ifp) { return ifp->flags & IFF_UP; } /* Is interface running? */ -int if_is_running(struct interface *ifp) +int if_is_running(const struct interface *ifp) { return ifp->flags & IFF_RUNNING; } @@ -450,7 +450,7 @@ int if_is_running(struct interface *ifp) /* Is the interface operative, eg. either UP & RUNNING or UP & !ZEBRA_INTERFACE_LINK_DETECTION and if ptm checking is enabled, then ptm check has passed */ -int if_is_operative(struct interface *ifp) +int if_is_operative(const struct interface *ifp) { return ((ifp->flags & IFF_UP) && (((ifp->flags & IFF_RUNNING) @@ -461,7 +461,7 @@ int if_is_operative(struct interface *ifp) /* Is the interface operative, eg. either UP & RUNNING or UP & !ZEBRA_INTERFACE_LINK_DETECTION, without PTM check */ -int if_is_no_ptm_operative(struct interface *ifp) +int if_is_no_ptm_operative(const struct interface *ifp) { return ((ifp->flags & IFF_UP) && ((ifp->flags & IFF_RUNNING) @@ -470,7 +470,7 @@ int if_is_no_ptm_operative(struct interface *ifp) } /* Is this loopback interface ? */ -int if_is_loopback(struct interface *ifp) +int if_is_loopback(const struct interface *ifp) { /* XXX: Do this better, eg what if IFF_WHATEVER means X on platform M * but Y on platform N? @@ -479,12 +479,12 @@ int if_is_loopback(struct interface *ifp) } /* Check interface is VRF */ -int if_is_vrf(struct interface *ifp) +int if_is_vrf(const struct interface *ifp) { return CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK); } -bool if_is_loopback_or_vrf(struct interface *ifp) +bool if_is_loopback_or_vrf(const struct interface *ifp) { if (if_is_loopback(ifp) || if_is_vrf(ifp)) return true; @@ -493,19 +493,19 @@ bool if_is_loopback_or_vrf(struct interface *ifp) } /* Does this interface support broadcast ? */ -int if_is_broadcast(struct interface *ifp) +int if_is_broadcast(const struct interface *ifp) { return ifp->flags & IFF_BROADCAST; } /* Does this interface support broadcast ? */ -int if_is_pointopoint(struct interface *ifp) +int if_is_pointopoint(const struct interface *ifp) { return ifp->flags & IFF_POINTOPOINT; } /* Does this interface support multicast ? */ -int if_is_multicast(struct interface *ifp) +int if_is_multicast(const struct interface *ifp) { return ifp->flags & IFF_MULTICAST; } diff --git a/lib/if.h b/lib/if.h index 6689769be..d26d4dd68 100644 --- a/lib/if.h +++ b/lib/if.h @@ -499,16 +499,16 @@ extern void if_delete_retain(struct interface *); deletes it from the interface list and frees the structure. */ extern void if_delete(struct interface *); -extern int if_is_up(struct interface *); -extern int if_is_running(struct interface *); -extern int if_is_operative(struct interface *); -extern int if_is_no_ptm_operative(struct interface *); -extern int if_is_loopback(struct interface *); -extern int if_is_vrf(struct interface *ifp); -extern bool if_is_loopback_or_vrf(struct interface *ifp); -extern int if_is_broadcast(struct interface *); -extern int if_is_pointopoint(struct interface *); -extern int if_is_multicast(struct interface *); +extern int if_is_up(const struct interface *ifp); +extern int if_is_running(const struct interface *ifp); +extern int if_is_operative(const struct interface *ifp); +extern int if_is_no_ptm_operative(const struct interface *ifp); +extern int if_is_loopback(const struct interface *ifp); +extern int if_is_vrf(const struct interface *ifp); +extern bool if_is_loopback_or_vrf(const struct interface *ifp); +extern int if_is_broadcast(const struct interface *ifp); +extern int if_is_pointopoint(const struct interface *ifp); +extern int if_is_multicast(const struct interface *ifp); struct vrf; extern void if_terminate(struct vrf *vrf); extern void if_dump_all(void); -- cgit v1.2.3