diff options
| -rw-r--r-- | eigrpd/eigrp_network.c | 5 | ||||
| -rw-r--r-- | eigrpd/eigrp_snmp.c | 6 | ||||
| -rw-r--r-- | lib/sigevent.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 2578fecb35..629beddec3 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -55,7 +55,10 @@ static void eigrp_network_run_interface(struct eigrp *, struct prefix *, int eigrp_sock_init(void) { int eigrp_sock; - int ret, hincl = 1; + int ret; +#ifdef IP_HDRINCL + int hincl = 1; +#endif if (eigrpd_privs.change(ZPRIVS_RAISE)) zlog_err("eigrp_sock_init: could not raise privs, %s", diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c index 7dd95b7bc6..92dc0611be 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -514,7 +514,6 @@ eigrp_snmp_nbr_lookup_next(struct in_addr *nbr_addr, unsigned int *ifindex, struct listnode *node, *nnode, *node2, *nnode2; struct eigrp_interface *ei; struct eigrp_neighbor *nbr; - struct route_node *rn; struct eigrp_neighbor *min = NULL; struct eigrp *eigrp; @@ -918,8 +917,6 @@ static uint8_t *eigrpTopologyEntry(struct variable *v, oid *name, WriteMethod **write_method) { struct eigrp *eigrp; - struct eigrp_interface *ei; - struct listnode *node, *nnode; eigrp = eigrp_lookup(); @@ -1067,7 +1064,6 @@ static uint8_t *eigrpPeerEntry(struct variable *v, oid *name, size_t *length, { struct eigrp *eigrp; struct eigrp_interface *ei; - struct listnode *node, *nnode; struct eigrp_neighbor *nbr; struct in_addr nbr_addr; unsigned int ifindex; @@ -1199,11 +1195,9 @@ static uint8_t *eigrpInterfaceEntry(struct variable *v, oid *name, WriteMethod **write_method) { struct eigrp *eigrp; - struct eigrp_interface *ei; struct listnode *node, *nnode; struct keychain *keychain; struct list *keylist; - int counter; eigrp = eigrp_lookup(); diff --git a/lib/sigevent.c b/lib/sigevent.c index d299760fab..59eaa80370 100644 --- a/lib/sigevent.c +++ b/lib/sigevent.c @@ -119,8 +119,6 @@ int quagga_sigevent_process(void) int quagga_signal_timer(struct thread *t) { struct quagga_sigevent_master_t *sigm; - struct quagga_signal_t *sig; - int i; sigm = THREAD_ARG(t); sigm->t = NULL; diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index c6e060500b..859d126e76 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2623,8 +2623,12 @@ int vtysh_write_config_integrated(void) char line[] = "do write terminal\n"; FILE *fp; int fd; +#ifdef FRR_USER struct passwd *pwentry; +#endif +#ifdef FRR_GROUP struct group *grentry; +#endif uid_t uid = -1; gid_t gid = -1; struct stat st; |