isisd: assorted fixes (unused variables, static)
This just mops up a few warnings in isisd.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 3d9fb47..4f7e2ce 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1342,7 +1342,6 @@
{
struct interface *ifp;
struct isis_area *area;
- struct listnode *node;
struct isis_circuit *circuit;
ifp = (struct interface *) vty->index;
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 4c09e79..88593de 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -2396,7 +2396,7 @@
top_lsp_refresh (struct thread *thread)
{
struct isis_lsp *lsp;
- u_int16_t rem_lifetime, refresh_time;
+ u_int16_t rem_lifetime;
lsp = THREAD_ARG (thread);
assert (lsp);
@@ -2420,7 +2420,7 @@
rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1);
lsp->lsp_header->rem_lifetime = htons (rem_lifetime);
- refresh_time = lsp_refresh_time (lsp, rem_lifetime);
+ /* refresh_time = lsp_refresh_time (lsp, rem_lifetime); */
THREAD_TIMER_ON (master, lsp->t_lsp_top_ref, top_lsp_refresh, lsp,
lsp->area->lsp_refresh[0]);
diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c
index 463f559..d202264 100644
--- a/isisd/isis_pfpacket.c
+++ b/isisd/isis_pfpacket.c
@@ -323,7 +323,6 @@
/* we need to do the LLC in here because of P2P circuits, which will
* not need it
*/
- int written = 1;
struct sockaddr_ll sa;
stream_set_getp (circuit->snd_stream, 0);
@@ -356,7 +355,7 @@
iov[1].iov_base = circuit->snd_stream->data;
iov[1].iov_len = stream_get_endp (circuit->snd_stream);
- written = sendmsg (circuit->fd, &msg, 0);
+ sendmsg (circuit->fd, &msg, 0);
return ISIS_OK;
}
@@ -364,7 +363,6 @@
int
isis_send_pdu_p2p (struct isis_circuit *circuit, int level)
{
- int written = 1;
struct sockaddr_ll sa;
stream_set_getp (circuit->snd_stream, 0);
@@ -381,7 +379,7 @@
/* lets try correcting the protocol */
sa.sll_protocol = htons (0x00FE);
- written = sendto (circuit->fd, circuit->snd_stream->data,
+ sendto (circuit->fd, circuit->snd_stream->data,
stream_get_endp (circuit->snd_stream), 0,
(struct sockaddr *) &sa,
sizeof (struct sockaddr_ll));
diff --git a/isisd/isis_tlv.c b/isisd/isis_tlv.c
index bbfa5d8..4fca072 100644
--- a/isisd/isis_tlv.c
+++ b/isisd/isis_tlv.c
@@ -115,7 +115,6 @@
struct ipv6_reachability *ipv6_reach;
int prefix_octets;
#endif /* HAVE_IPV6 */
- u_char virtual;
int value_len, retval = ISIS_OK;
u_char *start = stream, *pnt = stream, *endpnt;
@@ -179,7 +178,7 @@
* | Virtual Flag |
* +-------+-------+-------+-------+-------+-------+-------+-------+
*/
- virtual = *pnt; /* FIXME: what is the use for this? */
+ /* virtual = *pnt; FIXME: what is the use for this? */
pnt++;
value_len++;
/* +-------+-------+-------+-------+-------+-------+-------+-------+
@@ -926,7 +925,6 @@
struct prefix_ipv4 *ipv4;
u_char value[255];
u_char *pos = value;
- int retval;
for (ALL_LIST_ELEMENTS_RO (ip_addrs, node, ipv4))
{
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index 2df7462..1ba0100 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -318,7 +318,7 @@
}
#ifdef HAVE_IPV6
-void
+static void
isis_zebra_route_add_ipv6 (struct prefix *prefix,
struct isis_route_info *route_info)
{
@@ -519,8 +519,8 @@
struct stream *stream;
struct zapi_ipv4 api;
struct prefix_ipv4 p;
- unsigned long ifindex;
- struct in_addr nexthop;
+ unsigned long ifindex __attribute__ ((unused));
+ struct in_addr nexthop __attribute__ ((unused));
stream = zclient->ibuf;
memset (&p, 0, sizeof (struct prefix_ipv4));