diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2018-09-17 15:25:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 15:25:49 -0400 |
| commit | e8275c22b4c5dd5a6ff4a66befb61646e787ed0c (patch) | |
| tree | 674f9838e01f5eeb0be16963ae2a156f40f7ab12 /ldpd | |
| parent | b4657ea44c7853047fa21585defd06b4b2e52752 (diff) | |
| parent | 36de6e0e1ea886edd0ff7f706a5e8fc81ca9d1e6 (diff) | |
Merge pull request #3040 from pacovn/static_analysis__drop_const_1
bgpd isisd ldpd lib: const drop fixes (SA)
Diffstat (limited to 'ldpd')
| -rw-r--r-- | ldpd/adjacency.c | 8 | ||||
| -rw-r--r-- | ldpd/interface.c | 2 | ||||
| -rw-r--r-- | ldpd/l2vpn.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c index 7e4f0fd78b..0bdd2423c7 100644 --- a/ldpd/adjacency.c +++ b/ldpd/adjacency.c @@ -60,11 +60,11 @@ adj_compare(const struct adj *a, const struct adj *b) switch (a->source.type) { case HELLO_LINK: - if (if_cmp_name_func((char *)a->source.link.ia->iface->name, - (char *)b->source.link.ia->iface->name) < 0) + if (if_cmp_name_func(a->source.link.ia->iface->name, + b->source.link.ia->iface->name) < 0) return (-1); - if (if_cmp_name_func((char *)a->source.link.ia->iface->name, - (char *)b->source.link.ia->iface->name) > 0) + if (if_cmp_name_func(a->source.link.ia->iface->name, + b->source.link.ia->iface->name) > 0) return (1); return (ldp_addrcmp(a->source.link.ia->af, &a->source.link.src_addr, &b->source.link.src_addr)); diff --git a/ldpd/interface.c b/ldpd/interface.c index b25be43a5c..8b45703d22 100644 --- a/ldpd/interface.c +++ b/ldpd/interface.c @@ -45,7 +45,7 @@ RB_GENERATE(iface_head, iface, entry, iface_compare) static __inline int iface_compare(const struct iface *a, const struct iface *b) { - return (if_cmp_name_func((char *)a->name, (char *)b->name)); + return if_cmp_name_func(a->name, b->name); } struct iface * diff --git a/ldpd/l2vpn.c b/ldpd/l2vpn.c index 1cfeae3092..7f2e396a7f 100644 --- a/ldpd/l2vpn.c +++ b/ldpd/l2vpn.c @@ -119,7 +119,7 @@ l2vpn_exit(struct l2vpn *l2vpn) static __inline int l2vpn_if_compare(const struct l2vpn_if *a, const struct l2vpn_if *b) { - return (if_cmp_name_func((char *)a->ifname, (char *)b->ifname)); + return if_cmp_name_func(a->ifname, b->ifname); } struct l2vpn_if * @@ -182,7 +182,7 @@ l2vpn_if_update(struct l2vpn_if *lif) static __inline int l2vpn_pw_compare(const struct l2vpn_pw *a, const struct l2vpn_pw *b) { - return (if_cmp_name_func((char *)a->ifname, (char *)b->ifname)); + return if_cmp_name_func(a->ifname, b->ifname); } struct l2vpn_pw * |