diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-02-01 13:25:29 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-02-01 13:25:29 +0000 |
commit | 6590428ed3993f81f7696307fa275789505da1f3 (patch) | |
tree | f572668459b30a990cdc72e45d5844239efc4d9d /usr.sbin | |
parent | 8536f4d36e60ed7d85689af78a92ffc31efb7202 (diff) |
whitespace cleanup, no binary change.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ospfd/auth.c | 4 | ||||
-rw-r--r-- | usr.sbin/ospfd/interface.c | 8 | ||||
-rw-r--r-- | usr.sbin/ospfd/ospfd.c | 7 | ||||
-rw-r--r-- | usr.sbin/ospfd/parse.y | 4 | ||||
-rw-r--r-- | usr.sbin/ospfd/rde.c | 4 |
5 files changed, 13 insertions, 14 deletions
diff --git a/usr.sbin/ospfd/auth.c b/usr.sbin/ospfd/auth.c index 29f78024697..15942b312bc 100644 --- a/usr.sbin/ospfd/auth.c +++ b/usr.sbin/ospfd/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.11 2007/02/01 12:41:03 claudio Exp $ */ +/* $OpenBSD: auth.c,v 1.12 2007/02/01 13:25:28 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -224,7 +224,7 @@ md_list_copy(struct auth_md_head *to, struct auth_md_head *from) struct auth_md *m, *md; TAILQ_INIT(to); - + TAILQ_FOREACH(m, from, entry) { if ((md = calloc(1, sizeof(struct auth_md))) == NULL) fatalx("md_list_add"); diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c index f60c7745197..8d6f2f7e940 100644 --- a/usr.sbin/ospfd/interface.c +++ b/usr.sbin/ospfd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.57 2007/02/01 13:06:00 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.58 2007/02/01 13:25:28 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -564,7 +564,7 @@ if_act_reset(struct iface *iface) stop_ls_ack_tx_timer(iface); if_stop_hello_timer(iface); if_stop_wait_timer(iface); - + /* send empty hello to tell everybody that we are going down */ send_hello(iface); @@ -680,7 +680,7 @@ LIST_HEAD(,if_group_count) ifglist = LIST_HEAD_INITIALIZER(ifglist); int if_join_group(struct iface *iface, struct in_addr *addr) { - struct ip_mreq mreq; + struct ip_mreq mreq; struct if_group_count *ifg; switch (iface->type) { @@ -729,7 +729,7 @@ if_join_group(struct iface *iface, struct in_addr *addr) int if_leave_group(struct iface *iface, struct in_addr *addr) { - struct ip_mreq mreq; + struct ip_mreq mreq; struct if_group_count *ifg; switch (iface->type) { diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c index 9c8f70f3c3c..a1a5ebba837 100644 --- a/usr.sbin/ospfd/ospfd.c +++ b/usr.sbin/ospfd/ospfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.c,v 1.40 2007/02/01 13:02:04 claudio Exp $ */ +/* $OpenBSD: ospfd.c,v 1.41 2007/02/01 13:25:28 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -333,7 +333,7 @@ check_child(pid_t pid, const char *pname) void main_dispatch_ospfe(int fd, short event, void *bula) { - struct imsgbuf *ibuf = bula; + struct imsgbuf *ibuf = bula; struct imsg imsg; ssize_t n; @@ -761,7 +761,7 @@ merge_interfaces(struct area *a, struct area *xa) i->type = xi->type; /* needed? */ i->media_type = xi->media_type; /* needed? */ i->linkstate = xi->linkstate; /* needed? */ - + i->auth_type = xi->auth_type; strlcpy(i->auth_key, xi->auth_key, MAX_SIMPLE_AUTH_LEN); md_list_clr(&i->auth_md_list); @@ -788,4 +788,3 @@ iface_lookup(struct area *area, struct iface *iface) return (i); return (NULL); } - diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y index efffc79fad0..660356e9631 100644 --- a/usr.sbin/ospfd/parse.y +++ b/usr.sbin/ospfd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.42 2007/01/14 13:20:17 michele Exp $ */ +/* $OpenBSD: parse.y,v 1.43 2007/02/01 13:25:28 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -264,7 +264,7 @@ conf_main : ROUTERID STRING { ; optlist : /* empty */ { $$ = DEFAULT_REDIST_METRIC; } - | SET option { $$ = $2; } + | SET option { $$ = $2; } | SET optnl '{' optnl optlist_l optnl '}' { $$ = $5; } ; diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c index 184ef7ada18..8df20f1e466 100644 --- a/usr.sbin/ospfd/rde.c +++ b/usr.sbin/ospfd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.57 2007/02/01 13:02:05 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.58 2007/02/01 13:25:28 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -169,7 +169,7 @@ rde(struct ospfd_conf *xconf, int pipe_parent2rde[2], int pipe_ospfe2rde[2], LIST_FOREACH(area, &rdeconf->area_list, entry) LIST_FOREACH(iface, &area->iface_list, entry) md_list_clr(&iface->auth_md_list); - + while ((r = SIMPLEQ_FIRST(&rdeconf->redist_list)) != NULL) { SIMPLEQ_REMOVE_HEAD(&rdeconf->redist_list, entry); free(r); |