Skip to content

Commit

Permalink
Remove unneeded parameter 'first_time' from possibly_become_daemon()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
syzzer authored and cron2 committed Apr 13, 2015
1 parent 39e3d33 commit 857c04e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/openvpn/init.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 857c04e

Please sign in to comment.