Clean-up: common: fix -Wshadow error in lttng_daemonize

[lttng-tools.git] / src / common / daemonize.c

diff --git a/src/common/daemonize.c b/src/common/daemonize.c
index 3a006134b2bb9f5902b531b84c7d263315f81ae9..cb094b1effa52f7145132792d2845b7ce92e6ea5 100644 (file)
--- a/src/common/daemonize.c
+++ b/src/common/daemonize.c
@@ -1,39 +1,27 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
- * Copyright (C) 2014 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <unistd.h>
-#include <paths.h>
+#include <common/compat/paths.h>
 #include <fcntl.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <stdlib.h>
 
 #include <urcu/system.h>
 
-#include <src/common/daemonize.h>
-#include <src/common/error.h>
+#include <common/daemonize.h>
+#include <common/error.h>
 
 LTTNG_HIDDEN
 int lttng_daemonize(pid_t *child_ppid, int *completion_flag,
                int close_fds)
 {
-       int ret;
        pid_t pid;
 
        /* Get parent pid of this process. */
@@ -46,6 +34,7 @@ int lttng_daemonize(pid_t *child_ppid, int *completion_flag,
        } else if (pid == 0) {
                int fd;
                pid_t sid;
+               int ret;
 
                /* Child */
 
@@ -119,7 +108,7 @@ int lttng_daemonize(pid_t *child_ppid, int *completion_flag,
 
                /*
                 * From this point on, the parent can exit and the child
-                * is now an operationnal session daemon ready to serve
+                * is now an operational session daemon ready to serve
                 * clients and applications.
                 */
                exit(EXIT_SUCCESS);