summaryrefslogtreecommitdiffstats
path: root/ospfd/ospf_nsm.c
diff options
context:
space:
mode:
authorAndrew Certain <certain@amazon.com>2012-12-04 22:43:42 +0100
committerScott Feldman <sfeldma@cumulusnetworks.com>2013-01-07 18:59:59 +0100
commit0798cee34f5c436cd2a4b6e1d9a1ca90eee94292 (patch)
tree1b2293b711a12d743a0cd814235589bc4ce8d84f /ospfd/ospf_nsm.c
parentospfd: Update nsm_change_state to static scope, as it is not called from else... (diff)
downloadfrr-0798cee34f5c436cd2a4b6e1d9a1ca90eee94292.tar.xz
frr-0798cee34f5c436cd2a4b6e1d9a1ca90eee94292.zip
ospfd: compile warning cleanups
A set of patches to clarify some comments as well as cleanup code that was causing warnings. After these patches, the code can be compiled with -Wall -Wsign-compare -Wpointer-arith -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wchar-subscripts -Wcast-qual -Wextra -Wno-unused-parameter -Wno-missing-field-initializers (what is current in trunk plus -Wextra -Wno-unused-parameter -Wno-missing-field-initializers). Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
Diffstat (limited to 'ospfd/ospf_nsm.c')
-rw-r--r--ospfd/ospf_nsm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 436896c20..fe4ddf5b2 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -72,14 +72,11 @@ ospf_inactivity_timer (struct thread *thread)
static int
ospf_db_desc_timer (struct thread *thread)
{
- struct ospf_interface *oi;
struct ospf_neighbor *nbr;
nbr = THREAD_ARG (thread);
nbr->t_db_desc = NULL;
- oi = nbr->oi;
-
if (IS_DEBUG_OSPF (nsm, NSM_TIMERS))
zlog (NULL, LOG_DEBUG, "NSM[%s:%s]: Timer (DD Retransmit timer expire)",
IF_NAME (nbr->oi), inet_ntoa (nbr->src));
@@ -787,11 +784,9 @@ ospf_nsm_event (struct thread *thread)
int event;
int next_state;
struct ospf_neighbor *nbr;
- struct in_addr router_id;
nbr = THREAD_ARG (thread);
event = THREAD_VAL (thread);
- router_id = nbr->router_id;
if (IS_DEBUG_OSPF (nsm, NSM_EVENTS))
zlog_debug ("NSM[%s:%s]: %s (%s)", IF_NAME (nbr->oi),