diff options
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 | ||||
| -rw-r--r-- | ldpd/ldpd.c | 2 |
4 files changed, 8 insertions, 8 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 * diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 935e959596..137d9622d5 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -484,7 +484,7 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync) nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); if (nullfd == -1) { - flog_err_sys(LIB_ERR_SYSTEM_CALL, + flog_err_sys(EC_LIB_SYSTEM_CALL, "%s: failed to open /dev/null: %s", __func__, safe_strerror(errno)); } else { |