summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/ospfd/auth.c4
-rw-r--r--usr.sbin/ospfd/database.c3
-rw-r--r--usr.sbin/ospfd/hello.c3
-rw-r--r--usr.sbin/ospfd/lsack.c4
-rw-r--r--usr.sbin/ospfd/lsupdate.c4
-rw-r--r--usr.sbin/ospfd/packet.c3
-rw-r--r--usr.sbin/ospfd/rde_spf.c10
7 files changed, 7 insertions, 24 deletions
diff --git a/usr.sbin/ospfd/auth.c b/usr.sbin/ospfd/auth.c
index e558f26aab2..99a9e41cf1d 100644
--- a/usr.sbin/ospfd/auth.c
+++ b/usr.sbin/ospfd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.6 2005/10/19 22:00:37 stevesk Exp $ */
+/* $OpenBSD: auth.c,v 1.7 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -228,8 +228,6 @@ md_list_add(struct iface *iface, u_int8_t keyid, char *key)
}
}
TAILQ_INSERT_TAIL(&iface->auth_md_list, md, entry);
-
- return;
}
void
diff --git a/usr.sbin/ospfd/database.c b/usr.sbin/ospfd/database.c
index 203272fe056..298f1b5bd58 100644
--- a/usr.sbin/ospfd/database.c
+++ b/usr.sbin/ospfd/database.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: database.c,v 1.16 2005/11/04 10:30:23 claudio Exp $ */
+/* $OpenBSD: database.c,v 1.17 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -329,7 +329,6 @@ recv_db_description(struct nbr *nbr, char *buf, u_int16_t len)
nbr->last_rx_options = dd_hdr.opts;
nbr->last_rx_bits = dd_hdr.bits;
- return;
}
void
diff --git a/usr.sbin/ospfd/hello.c b/usr.sbin/ospfd/hello.c
index eba687512ac..67d73d03a3d 100644
--- a/usr.sbin/ospfd/hello.c
+++ b/usr.sbin/ospfd/hello.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hello.c,v 1.10 2005/09/17 20:03:35 msf Exp $ */
+/* $OpenBSD: hello.c,v 1.11 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -268,5 +268,4 @@ recv_hello(struct iface *iface, struct in_addr src, u_int32_t rtr_id, char *buf,
if_fsm(iface, IF_EVT_NBR_CHNG);
/* TODO NBMA needs some special handling */
- return;
}
diff --git a/usr.sbin/ospfd/lsack.c b/usr.sbin/ospfd/lsack.c
index bccdf4a54dd..11bfceb831a 100644
--- a/usr.sbin/ospfd/lsack.c
+++ b/usr.sbin/ospfd/lsack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsack.c,v 1.14 2005/10/19 13:07:58 stevesk Exp $ */
+/* $OpenBSD: lsack.c,v 1.15 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -113,8 +113,6 @@ recv_ls_ack(struct nbr *nbr, char *buf, u_int16_t len)
default:
fatalx("recv_ls_ack: unknown neighbor state");
}
-
- return;
}
int
diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c
index 3cbba9d5e86..9dbeacd3848 100644
--- a/usr.sbin/ospfd/lsupdate.c
+++ b/usr.sbin/ospfd/lsupdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsupdate.c,v 1.20 2005/10/21 11:53:27 claudio Exp $ */
+/* $OpenBSD: lsupdate.c,v 1.21 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -250,8 +250,6 @@ recv_ls_update(struct nbr *nbr, char *buf, u_int16_t len)
default:
fatalx("recv_ls_update: unknown neighbor state");
}
-
- return;
}
/* link state retransmit list */
diff --git a/usr.sbin/ospfd/packet.c b/usr.sbin/ospfd/packet.c
index d73ab83af7e..647b50bfba2 100644
--- a/usr.sbin/ospfd/packet.c
+++ b/usr.sbin/ospfd/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.17 2005/10/26 01:28:41 stevesk Exp $ */
+/* $OpenBSD: packet.c,v 1.18 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -200,7 +200,6 @@ recv_packet(int fd, short event, void *bula)
}
done:
free(ptr);
- return;
}
int
diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c
index 6a7b40c5e81..69ef023310a 100644
--- a/usr.sbin/ospfd/rde_spf.c
+++ b/usr.sbin/ospfd/rde_spf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_spf.c,v 1.35 2005/11/04 14:37:26 claudio Exp $ */
+/* $OpenBSD: rde_spf.c,v 1.36 2005/11/12 18:18:24 deraadt Exp $ */
/*
* Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -72,8 +72,6 @@ spf_dump(struct area *area)
log_debug("");
#endif
}
-
- return;
}
void
@@ -358,8 +356,6 @@ spf_calc(struct area *area)
area->num_spf_calc++;
start_spf_timer();
-
- return;
}
void
@@ -438,8 +434,6 @@ calc_next_hop(struct vertex *dst, struct vertex *parent)
}
/* case 3 */
dst->nexthop = parent->nexthop;
-
- return;
}
/* candidate list */
@@ -465,8 +459,6 @@ cand_list_add(struct vertex *v)
}
}
TAILQ_INSERT_TAIL(&cand_list, v, cand);
-
- return;
}
void