diff options
| author | Steffan Karger <steffan@karger.me> | 2015-03-26 01:01:29 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-04-13 21:14:32 +0200 |
| commit | 857c04ef06cd13d59c5b45332f07996e71372576 (patch) | |
| tree | 6d15172c10f285f3e41ad6d1d44c101c97c7b5d8 | |
| parent | 39e3d336d4eeab847a3395ddeb430e0a9ca387b9 (diff) | |
| download | openvpn-857c04ef06cd13d59c5b45332f07996e71372576.tar.gz openvpn-857c04ef06cd13d59c5b45332f07996e71372576.tar.xz openvpn-857c04ef06cd13d59c5b45332f07996e71372576.zip | |
Remove unneeded parameter 'first_time' from possibly_become_daemon()
The static helper function possibly_become_daemon() is called only once,
by do_init_first_time(), which checks 'first_time' to be true before
calling possibly_become_daemon(). This makes the parameter useless.
Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1427328089-886-1-git-send-email-steffan@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9555
Signed-off-by: Gert Doering <gert@greenie.muc.de>
| -rw-r--r-- | src/openvpn/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b670a48..b97d2da 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -917,10 +917,10 @@ do_persist_tuntap (const struct options *options) * Return true if we did it. */ static bool -possibly_become_daemon (const struct options *options, const bool first_time) +possibly_become_daemon (const struct options *options) { bool ret = false; - if (first_time && options->daemon) + if (options->daemon) { ASSERT (!options->inetd); if (daemon (options->cd_dir != NULL, options->log) < 0) @@ -2771,7 +2771,7 @@ do_init_first_time (struct context *c) get_pid_file (c->options.writepid, &c0->pid_state); /* become a daemon if --daemon */ - c->did_we_daemonize = possibly_become_daemon (&c->options, c->first_time); + c->did_we_daemonize = possibly_become_daemon (&c->options); /* should we disable paging? */ if (c->options.mlock && c->did_we_daemonize) |