Преглед изворни кода

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

So that it does not just return on non-handled OSes.
Erast Benson пре 18 година
родитељ
комит
d02a285c9a
2 измењених фајлова са 7 додато и 1 уклоњено
  1. 5 0
      ChangeLog
  2. 2 1
      utils/start-stop-daemon.c

+ 5 - 0
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

+ 2 - 1
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))