s-s-d: Move 'return' inside preprocessor conditionals

So that it does not just return on non-handled OSes.

diff --git a/ChangeLog b/ChangeLog
index 7581f18a5fde6383456a145c640948418823677c..3e181d72dad252dbc022428c7ec116a071617d61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-15  Erast Benson  <erast@gnusolaris.org>
+
+       * utils/start-stop-daemon.c (check): Move 'return' inside preprocessor
+       conditionals, so that it does not just return on non-handled OSes.
+
 2008-03-15  Erast Benson  <erast@gnusolaris.org>
 
        * utils/start-stop-daemon.c: Use __sun instead of __sparc__ to

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index c02bd6af736a6fb4d0b93736f188821c2d3c626f..72ad5183bbd5d4b06c6bd6f80c91cce5554ce88b 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -803,11 +803,12 @@ check(pid_t pid)
 {
 #if defined(OSLinux) || defined(OShpux)
        if (execname && !pid_is_exec(pid, &exec_stat))
+               return;
 #elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD)
        /* Let's try this to see if it works */
        if (execname && !pid_is_cmd(pid, execname))
-#endif
                return;
+#endif
        if (userspec && !pid_is_user(pid, user_id))
                return;
        if (cmdname && !pid_is_cmd(pid, cmdname))