X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdaemon.c;h=ecca606126f5028842b04e704020ad7f00a1adef;hb=781dee0835fbea52f57389893d50b2cf9f60e41f;hp=672568342a76c4bf3d3c8f0d22368c8a4eb352fb;hpb=e6c5e5390395a2ef19676319caa97b4e5a6942e2;p=openvswitch diff --git a/lib/daemon.c b/lib/daemon.c index 67256834..ecca6061 100644 --- a/lib/daemon.c +++ b/lib/daemon.c @@ -351,13 +351,11 @@ static void monitor_daemon(pid_t daemon_pid) { /* XXX Should log daemon's stderr output at startup time. */ - const char *saved_program_name; time_t last_restart; char *status_msg; int crashes; - saved_program_name = program_name; - program_name = xasprintf("monitor(%s)", program_name); + subprogram_name = "monitor"; status_msg = xstrdup("healthy"); last_restart = TIME_MIN; crashes = 0; @@ -366,7 +364,7 @@ monitor_daemon(pid_t daemon_pid) int status; proctitle_set("%s: monitoring pid %lu (%s)", - saved_program_name, (unsigned long int) daemon_pid, + program_name, (unsigned long int) daemon_pid, status_msg); do { @@ -428,8 +426,7 @@ monitor_daemon(pid_t daemon_pid) /* Running in new daemon process. */ proctitle_restore(); - free((char *) program_name); - program_name = saved_program_name; + subprogram_name = ""; } /* Close standard file descriptors (except any that the client has requested we