From 63ca37f3139505a1881bf2c343f18d4ed8e22ce4 Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Sun, 20 Feb 2005 18:56:06 +0000 Subject: [PATCH] Cleanup - all unused variables deleted. --- proto/ospf/iface.c | 1 - proto/ospf/ospf.c | 8 -------- proto/ospf/packet.c | 3 --- proto/ospf/rt.c | 4 +--- proto/ospf/topology.c | 4 ---- 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index cce7fafe..e4070fd6 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -484,7 +484,6 @@ ospf_iface_notify(struct proto *p, unsigned flags, struct iface *iface) struct ospf_area_config *ac; struct ospf_iface_patt *ip = NULL; struct ospf_iface *ifa; - struct ospf_area *oa; DBG("%s: If notify called\n", p->name); if (iface->flags & IF_IGNORE) diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 7f6b0da9..f66dbad2 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -194,7 +194,6 @@ ospf_dump(struct proto *p) struct ospf_iface *ifa; struct ospf_neighbor *n; struct proto_ospf *po = (struct proto_ospf *) p; - struct ospf_area *oa; OSPF_TRACE(D_EVENTS, "Area number: %d", po->areano); @@ -574,17 +573,10 @@ ospf_reconfigure(struct proto *p, struct proto_config *c) struct ospf_iface *ifa; struct nbma_node *nb1, *nb2, *nbnx; struct ospf_area *oa = NULL; - struct area_net *anet, *antmp; int found, olddead, newdead; - struct net_fib *nf; struct area_net_config *anc; struct area_net *an; - //return !memcmp(((byte *) old) + sizeof(struct proto_config), - // ((byte *) new) + sizeof(struct proto_config), - // sizeof(struct ospf_config) - sizeof(struct proto_config)); - - po->rfc1583 = new->rfc1583; schedule_rtcalc(po); diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c index 273a4a26..f06d3e0e 100644 --- a/proto/ospf/packet.c +++ b/proto/ospf/packet.c @@ -38,8 +38,6 @@ ospf_pkt_maxsize(struct ospf_iface *ifa) void ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt) { - struct proto_ospf *po = ifa->oa->po; - struct proto *p = &po->proto; struct password_item *passwd = password_find (ifa->passwords); void *tail; struct MD5Context ctxt; @@ -94,7 +92,6 @@ ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt) static int ospf_pkt_checkauth(struct ospf_neighbor *n, struct ospf_iface *ifa, struct ospf_packet *pkt, int size) { - int i; struct proto_ospf *po = ifa->oa->po; struct proto *p = &po->proto; struct password_item *pass = NULL, *ptmp; diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index c2f7ca0e..2ecc7a6c 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -472,7 +472,7 @@ ospf_rt_sum(struct ospf_area *oa) ip_addr *mask, ip, abrip; /* abrIP is actually ID */ struct area_net *anet; orta nf; - ort *re, *abr; + ort *abr; int mlen = -1, type = -1; union ospf_lsa_sum_tm *tm; @@ -554,7 +554,6 @@ ospf_rt_spf(struct proto_ospf *po) { struct proto *p = &po->proto; struct ospf_area *oa; - int i; ort *ri; struct area_net *anet; @@ -642,7 +641,6 @@ ospf_ext_spf(struct proto_ospf *po) struct ospf_iface *nhi = NULL; int met1, met2; neighbor *nn; - struct ospf_lsa_rt *rt; struct ospf_area *atmp; diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 34fc3165..85c640c5 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -24,7 +24,6 @@ static void * originate_rt_lsa_body(struct ospf_area *oa, u16 * length) { struct proto_ospf *po = oa->po; - struct proto *p = &po->proto; struct ospf_iface *ifa; int j = 0, k = 0; u16 i = 0; @@ -403,7 +402,6 @@ flush_sum_lsa(struct ospf_area *oa, struct fib_node *fn, int type) struct ospf_lsa_header lsa; int max, i; struct ospf_lsa_sum *sum = NULL; - union ospf_lsa_sum_tm *tm; lsa.rt = rtid; lsa.type = LSA_T_SUM_NET; @@ -511,9 +509,7 @@ originate_sum_lsa(struct ospf_area *oa, struct fib_node *fn, int type, int metri void check_sum_lsa(struct proto_ospf *po, ort *nf, int dest) { - struct proto *p = &po->proto; struct ospf_area *oa; - struct area_net *anet; int flush, mlen; ip_addr ip;