summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-09-28 08:19:53 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-09-28 08:19:53 +0000
commit4249518ed2865bd0af8675df9d41de08b1f7a0c5 (patch)
treebebd11d8ef077d08a0ec4b22ee8840036fc82457
parent78da3916805165657fac7d4cee54ae87f813d700 (diff)
Cleanup some #includes plus some minor other cleanup. OK norby@
-rw-r--r--usr.sbin/ospfd/area.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/usr.sbin/ospfd/area.c b/usr.sbin/ospfd/area.c
index e6791c8ece5..95784de2826 100644
--- a/usr.sbin/ospfd/area.c
+++ b/usr.sbin/ospfd/area.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: area.c,v 1.6 2007/06/13 17:23:36 claudio Exp $ */
+/* $OpenBSD: area.c,v 1.7 2007/09/28 08:19:52 claudio Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -17,11 +17,7 @@
*/
#include <sys/types.h>
-#include <sys/socket.h>
#include <sys/tree.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <err.h>
#include <stdlib.h>
@@ -49,9 +45,9 @@ area_new(void)
int
area_del(struct area *area)
{
- struct iface *iface = NULL;
- struct vertex *v, *nv;
- struct rde_nbr *n;
+ struct iface *iface = NULL;
+ struct vertex *v, *nv;
+ struct rde_nbr *n;
/* area is removed so neutralize the demotion done by the area */
if (area->active == 0)
@@ -93,12 +89,12 @@ area_find(struct ospfd_conf *conf, struct in_addr area_id)
void
area_track(struct area *area, int state)
{
- int old = area->active;
+ int old = area->active;
if (state & NBR_STA_FULL)
area->active++;
else if (area->active == 0)
- fatalx("king bula sez: area already inactive");
+ fatalx("area_track: area already inactive");
else
area->active--;