From 57d8aa8ffefcc226c5c3179e4a8d346cbe61e865 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 22 May 2024 19:52:54 +0200 Subject: [PATCH] util: Rename write_pidfile() to pidfile_write() As I'm adding pidfile_open() in the next patch. The function comment didn't match, by the way. Signed-off-by: Stefano Brivio Reviewed-by: Richard W.M. Jones --- passt.c | 2 +- util.c | 6 +++--- util.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/passt.c b/passt.c index 1df1dc4..fb9773d 100644 --- a/passt.c +++ b/passt.c @@ -317,7 +317,7 @@ int main(int argc, char **argv) if (!c.foreground) __daemon(pidfile_fd, devnull_fd); else - write_pidfile(pidfile_fd, getpid()); + pidfile_write(pidfile_fd, getpid()); if (pasta_child_pid) kill(pasta_child_pid, SIGUSR1); diff --git a/util.c b/util.c index 975664a..8a2ffaf 100644 --- a/util.c +++ b/util.c @@ -380,11 +380,11 @@ int open_in_ns(const struct ctx *c, const char *path, int flags) } /** - * pid_file() - Write PID to file, if requested to do so, and close it + * pidfile_write() - Write PID to file, if requested to do so, and close it * @fd: Open PID file descriptor, closed on exit, -1 to skip writing it * @pid: PID value to write */ -void write_pidfile(int fd, pid_t pid) +void pidfile_write(int fd, pid_t pid) { char pid_buf[12]; int n; @@ -419,7 +419,7 @@ int __daemon(int pidfile_fd, int devnull_fd) } if (pid) { - write_pidfile(pidfile_fd, pid); + pidfile_write(pidfile_fd, pid); exit(EXIT_SUCCESS); } diff --git a/util.h b/util.h index c8a357e..6fa8df2 100644 --- a/util.h +++ b/util.h @@ -156,7 +156,7 @@ char *line_read(char *buf, size_t len, int fd); void ns_enter(const struct ctx *c); bool ns_is_init(void); int open_in_ns(const struct ctx *c, const char *path, int flags); -void write_pidfile(int fd, pid_t pid); +void pidfile_write(int fd, pid_t pid); int __daemon(int pidfile_fd, int devnull_fd); int fls(unsigned long x); int write_file(const char *path, const char *buf);