diff options
| author | Christian Hopps <chopps@labn.net> | 2022-02-24 01:43:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 01:43:48 -0500 |
| commit | 7bf63db79b7848b73e1cef49f3496038644bea16 (patch) | |
| tree | 2c95921d910689673348e60f9614de7d9d00c4e7 /lib/libfrr.c | |
| parent | ca6c97340b013e140c0cb31737858f7c672b7dfb (diff) | |
| parent | cc9f21da2218d95567eff1501482ce58e6600f54 (diff) | |
Merge pull request #10632 from donaldsharp/thread_return_null
*: Change thread->func to return void instead of int
Diffstat (limited to 'lib/libfrr.c')
| -rw-r--r-- | lib/libfrr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c index d5e326be41..10b3aad89e 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -962,7 +962,7 @@ static void frr_daemonize(void) * to read the config in after thread execution starts, so that * we can match this behavior. */ -static int frr_config_read_in(struct thread *t) +static void frr_config_read_in(struct thread *t) { hook_call(frr_config_pre, master); @@ -1000,8 +1000,6 @@ static int frr_config_read_in(struct thread *t) } hook_call(frr_config_post, master); - - return 0; } void frr_config_fork(void) @@ -1097,7 +1095,7 @@ static void frr_terminal_close(int isexit) static struct thread *daemon_ctl_thread = NULL; -static int frr_daemon_ctl(struct thread *t) +static void frr_daemon_ctl(struct thread *t) { char buf[1]; ssize_t nr; @@ -1106,7 +1104,7 @@ static int frr_daemon_ctl(struct thread *t) if (nr < 0 && (errno == EINTR || errno == EAGAIN)) goto out; if (nr <= 0) - return 0; + return; switch (buf[0]) { case 'S': /* SIGTSTP */ @@ -1131,7 +1129,6 @@ static int frr_daemon_ctl(struct thread *t) out: thread_add_read(master, frr_daemon_ctl, NULL, daemon_ctl_sock, &daemon_ctl_thread); - return 0; } void frr_detach(void) |