diff options
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_message.c | 5 | ||||
| -rw-r--r-- | ospf6d/ospf6_network.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_route.c | 5 | ||||
| -rw-r--r-- | ospf6d/ospf6_spf.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_zebra.c | 8 | ||||
| -rw-r--r-- | ospf6d/ospf6d.h | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index 228a525e76..cd688bbf89 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -1559,8 +1559,7 @@ int ospf6_receive(struct thread *thread) /* receive message */ len = ospf6_recvmsg(&src, &dst, &ifindex, iovector); if (len > iobuflen) { - flog_err(LIB_ERR_DEVELOPMENT, - "Excess message read"); + flog_err(EC_LIB_DEVELOPMENT, "Excess message read"); return 0; } @@ -1708,7 +1707,7 @@ static void ospf6_send(struct in6_addr *src, struct in6_addr *dst, /* send message */ len = ospf6_sendmsg(src, dst, &oi->interface->ifindex, iovector); if (len != ntohs(oh->length)) - flog_err(LIB_ERR_DEVELOPMENT, "Could not send entire message"); + flog_err(EC_LIB_DEVELOPMENT, "Could not send entire message"); } static uint32_t ospf6_packet_max(struct ospf6_interface *oi) diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c index 8988a53e5d..8df5f1cc47 100644 --- a/ospf6d/ospf6_network.c +++ b/ospf6d/ospf6_network.c @@ -118,7 +118,7 @@ int ospf6_sso(ifindex_t ifindex, struct in6_addr *group, int option) sizeof(mreq6)); if (ret < 0) { flog_err_sys( - LIB_ERR_SOCKET, + EC_LIB_SOCKET, "Network: setsockopt (%d) on ifindex %d failed: %s", option, ifindex, safe_strerror(errno)); return ret; diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index 021e825ae3..bba3c0db5e 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -574,8 +574,9 @@ static void route_table_assert(struct ospf6_route_table *table) if (link_error == 0 && num == table->count) return; - flog_err(LIB_ERR_DEVELOPMENT, "PANIC !!"); - flog_err(LIB_ERR_DEVELOPMENT, "Something has gone wrong with ospf6_route_table[%p]", table); + flog_err(EC_LIB_DEVELOPMENT, "PANIC !!"); + flog_err(EC_LIB_DEVELOPMENT, + "Something has gone wrong with ospf6_route_table[%p]", table); zlog_debug("table count = %d, real number = %d", table->count, num); zlog_debug("DUMP START"); for (r = ospf6_route_head(table); r; r = ospf6_route_next(r)) { diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 9c13c51b1f..d9ddc1bb83 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -273,8 +273,8 @@ static void ospf6_nexthop_calc(struct ospf6_vertex *w, struct ospf6_vertex *v, ifindex = (VERTEX_IS_TYPE(NETWORK, v) ? ospf6_spf_get_ifindex_from_nh(v) : ROUTER_LSDESC_GET_IFID(lsdesc)); if (ifindex == 0) { - flog_err(LIB_ERR_DEVELOPMENT, - "No nexthop ifindex at vertex %s", v->name); + flog_err(EC_LIB_DEVELOPMENT, "No nexthop ifindex at vertex %s", + v->name); return; } diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 06a84dcb93..c968b35d90 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -363,10 +363,10 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request) ret = zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api); if (ret < 0) - flog_err(LIB_ERR_ZAPI_SOCKET, - "zclient_route_send() %s failed: %s", - (type == REM ? "delete" : "add"), - safe_strerror(errno)); + flog_err(EC_LIB_ZAPI_SOCKET, + "zclient_route_send() %s failed: %s", + (type == REM ? "delete" : "add"), + safe_strerror(errno)); return; } diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index f95381084d..36f3c2233f 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -72,12 +72,12 @@ extern struct thread_master *master; #define threadtimer_string(now, t, buf, size) \ do { \ - struct timeval result; \ + struct timeval _result; \ if (!t) \ snprintf(buf, size, "inactive"); \ else { \ - timersub(&t->u.sands, &now, &result); \ - timerstring(&result, buf, size); \ + timersub(&t->u.sands, &now, &_result); \ + timerstring(&_result, buf, size); \ } \ } while (0) |