From 30853d7473a502248c87f0a743090df8d7d6a81f Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 8 Aug 2007 03:07:09 +0000 Subject: If given a pidfile, just match on that for seeing if we have crashed or not, #186159. --- src/librc-daemon.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/librc-daemon.c b/src/librc-daemon.c index b59460dd..9e3ea488 100644 --- a/src/librc-daemon.c +++ b/src/librc-daemon.c @@ -515,6 +515,12 @@ bool rc_service_daemons_crashed (const char *service) fclose (fp); free (pidfile); pidfile = NULL; + + /* We have the pid, so no need to match on name */ + free (exec); + exec = NULL; + free (name); + name = NULL; } if ((pids = rc_find_pids (exec, name, 0, pid)) == NULL) { @@ -523,25 +529,14 @@ bool rc_service_daemons_crashed (const char *service) } free (pids); - if (exec) { - free (exec); - exec = NULL; - } - if (name) { - free (name); - name = NULL; - } - } - - if (exec) { free (exec); exec = NULL; - } - if (name) { free (name); name = NULL; } + free (exec); + free (name); free (dirpath); rc_strlist_free (files); -- cgit v1.2.3