mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: Rename write_pidfile() to pidfile_write()

Browse source 
As I'm adding pidfile_open() in the next patch. The function comment
didn't match, by the way.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
Stefano Brivio 2024-05-22 19:52:54 +02:00
parent cbca08cd38
commit 57d8aa8ffe
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
passt.c
View file

@ -317,7 +317,7 @@ int main(int argc, char **argv)
if (!c.foreground) if (!c.foreground)
__daemon(pidfile_fd, devnull_fd); __daemon(pidfile_fd, devnull_fd);
else else
write_pidfile(pidfile_fd, getpid()); pidfile_write(pidfile_fd, getpid());
if (pasta_child_pid) if (pasta_child_pid)
kill(pasta_child_pid, SIGUSR1); kill(pasta_child_pid, SIGUSR1);

6
util.c
View file

@ -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 * @fd: Open PID file descriptor, closed on exit, -1 to skip writing it
* @pid: PID value to write * @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]; char pid_buf[12];
int n; int n;
@ -419,7 +419,7 @@ int __daemon(int pidfile_fd, int devnull_fd)
} }
if (pid) { if (pid) {
write_pidfile(pidfile_fd, pid); pidfile_write(pidfile_fd, pid);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

2
util.h
View file

@ -156,7 +156,7 @@ char *line_read(char *buf, size_t len, int fd);
void ns_enter(const struct ctx *c); void ns_enter(const struct ctx *c);
bool ns_is_init(void); bool ns_is_init(void);
int open_in_ns(const struct ctx *c, const char *path, int flags); 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 __daemon(int pidfile_fd, int devnull_fd);
int fls(unsigned long x); int fls(unsigned long x);
int write_file(const char *path, const char *buf); int write_file(const char *path, const char *buf);