chiark / gitweb /
service: minor change in service_load_pid_file return value
authorMichal Schmidt <mschmidt@redhat.com>
Wed, 21 Sep 2011 00:25:17 +0000 (02:25 +0200)
committerMichal Schmidt <mschmidt@redhat.com>
Wed, 21 Sep 2011 00:25:17 +0000 (02:25 +0200)
Return 0 only if the PID was really loaded. If no PIDFile= is defined,
return -ENOENT.

Only one caller cares about the return value of this function and this
change makes the usage nicer.

src/service.c

index 8f827aa..5050bca 100644 (file)
@@ -1270,7 +1270,7 @@ static int service_load_pid_file(Service *s) {
         assert(s);
 
         if (!s->pid_file)
-                return 0;
+                return -ENOENT;
 
         if ((r = read_one_line_file(s->pid_file, &k)) < 0)
                 return r;
@@ -2585,7 +2585,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                 /* Forking services may occasionally move to a new PID.
                  * As long as they update the PID file before exiting the old
                  * PID, they're fine. */
-                if (s->pid_file && service_load_pid_file(s) == 0)
+                if (service_load_pid_file(s) == 0)
                         return;
 
                 s->main_pid = 0;