diff options
| author |   renato <renato@openbsd.org> | 2016-09-02 17:10:34 +0000 |
|---|---|---|
| committer | renato <renato@openbsd.org> | 2016-09-02 17:10:34 +0000 |
| commit | e21b401eaa6c8aed20cc9de8fb7b756fe98458b0 (patch) | |
| tree | e65e738ced2908f2e028e5f836e79f41d281d228 | |
| parent | Enable SGI for iwm(4). (diff) | |
| download | wireguard-openbsd-e21b401eaa6c8aed20cc9de8fb7b756fe98458b0.tar.xz wireguard-openbsd-e21b401eaa6c8aed20cc9de8fb7b756fe98458b0.zip | |
lde() and ldpe() should return void.
Remove these leftovers from the pre-fork+exec era.
Spotted by and ok rzalamena@ ok claudio@
| -rw-r--r-- | usr.sbin/ldpd/lde.c | 7 | ||||
| -rw-r--r-- | usr.sbin/ldpd/lde.h | 4 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldpe.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldpe.h | 4 |
4 files changed, 8 insertions, 13 deletions
diff --git a/usr.sbin/ldpd/lde.c b/usr.sbin/ldpd/lde.c index 2985cac573b..b5186a8d816 100644 --- a/usr.sbin/ldpd/lde.c +++ b/usr.sbin/ldpd/lde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lde.c,v 1.66 2016/09/02 17:05:23 renato Exp $ */ +/* $OpenBSD: lde.c,v 1.67 2016/09/02 17:10:34 renato Exp $ */ /* * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org> @@ -84,7 +84,7 @@ lde_sig_handler(int sig, short event, void *arg) } /* label decision engine */ -pid_t +void lde(int debug, int verbose) { struct event ev_sigint, ev_sigterm; @@ -145,9 +145,6 @@ lde(int debug, int verbose) event_dispatch(); lde_shutdown(); - /* NOTREACHED */ - - return (0); } static __dead void diff --git a/usr.sbin/ldpd/lde.h b/usr.sbin/ldpd/lde.h index 77431b87a3f..20b3ea6881e 100644 --- a/usr.sbin/ldpd/lde.h +++ b/usr.sbin/ldpd/lde.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lde.h,v 1.43 2016/07/01 23:36:38 renato Exp $ */ +/* $OpenBSD: lde.h,v 1.44 2016/09/02 17:10:34 renato Exp $ */ /* * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org> @@ -124,7 +124,7 @@ extern struct nbr_tree lde_nbrs; extern struct event gc_timer; /* lde.c */ -pid_t lde(int, int); +void lde(int, int); int lde_imsg_compose_ldpe(int, uint32_t, pid_t, void *, uint16_t); uint32_t lde_assign_label(void); void lde_send_change_klabel(struct fec_node *, struct fec_nh *); diff --git a/usr.sbin/ldpd/ldpe.c b/usr.sbin/ldpd/ldpe.c index 4169f988b5d..218e431fbf7 100644 --- a/usr.sbin/ldpd/ldpe.c +++ b/usr.sbin/ldpd/ldpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpe.c,v 1.69 2016/09/02 17:03:24 renato Exp $ */ +/* $OpenBSD: ldpe.c,v 1.70 2016/09/02 17:10:34 renato Exp $ */ /* * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org> @@ -65,7 +65,7 @@ ldpe_sig_handler(int sig, short event, void *bula) } /* label distribution protocol engine */ -pid_t +void ldpe(int debug, int verbose) { struct passwd *pw; @@ -153,8 +153,6 @@ ldpe(int debug, int verbose) event_dispatch(); ldpe_shutdown(); - /* NOTREACHED */ - return (0); } static __dead void diff --git a/usr.sbin/ldpd/ldpe.h b/usr.sbin/ldpd/ldpe.h index f8c6f223700..bf62dc0bbee 100644 --- a/usr.sbin/ldpd/ldpe.h +++ b/usr.sbin/ldpd/ldpe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpe.h,v 1.67 2016/07/16 19:24:30 renato Exp $ */ +/* $OpenBSD: ldpe.h,v 1.68 2016/09/02 17:10:34 renato Exp $ */ /* * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org> @@ -179,7 +179,7 @@ int tlv_decode_fec_elm(struct nbr *, struct ldp_msg *, char *, uint16_t, struct map *); /* ldpe.c */ -pid_t ldpe(int, int); +void ldpe(int, int); int ldpe_imsg_compose_parent(int, pid_t, void *, uint16_t); int ldpe_imsg_compose_lde(int, uint32_t, pid_t, void *, |