projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Generalize facet_put__() so that it is more useful.
[openvswitch]
/
lib
/
daemon.c
diff --git
a/lib/daemon.c
b/lib/daemon.c
index c6489cd5bb2be128ed0f3a0fb5b24759d75efbf4..c0f168291e6ed053540e9260ec8e6997d4b8d4a3 100644
(file)
--- a/
lib/daemon.c
+++ b/
lib/daemon.c
@@
-67,8
+67,8
@@
char *
make_pidfile_name(const char *name)
{
return (!name
make_pidfile_name(const char *name)
{
return (!name
- ? xasprintf("%s/%s.pid", ovs_rundir, program_name)
- : abs_file_name(ovs_rundir, name));
+ ? xasprintf("%s/%s.pid", ovs_rundir
()
, program_name)
+ : abs_file_name(ovs_rundir
()
, name));
}
/* Sets up a following call to daemonize() to create a pidfile named 'name'.
}
/* Sets up a following call to daemonize() to create a pidfile named 'name'.
@@
-500,7
+500,7
@@
daemon_usage(void)
" --pidfile[=FILE] create pidfile (default: %s/%s.pid)\n"
" --overwrite-pidfile with --pidfile, start even if already "
"running\n",
" --pidfile[=FILE] create pidfile (default: %s/%s.pid)\n"
" --overwrite-pidfile with --pidfile, start even if already "
"running\n",
- ovs_rundir, program_name);
+ ovs_rundir
()
, program_name);
}
/* Opens and reads a PID from 'pidfile'. Returns the nonnegative PID if
}
/* Opens and reads a PID from 'pidfile'. Returns the nonnegative PID if