From 09c866e34dd6f1725ff5a2354017c13485c2c755 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Mon, 6 Aug 2018 16:36:50 +0000 Subject: *: rename ferr_zlog -> flog_err_sys Signed-off-by: Quentin Young --- lib/pid_output.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'lib/pid_output.c') diff --git a/lib/pid_output.c b/lib/pid_output.c index 5132e2f122..c6120de861 100644 --- a/lib/pid_output.c +++ b/lib/pid_output.c @@ -42,9 +42,9 @@ pid_t pid_output(const char *path) oldumask = umask(0777 & ~PIDFILE_MASK); fd = open(path, O_RDWR | O_CREAT, PIDFILE_MASK); if (fd < 0) { - flog_err(LIB_ERR_SYSTEM_CALL, - "Can't create pid lock file %s (%s), exiting", path, - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SYSTEM_CALL, + "Can't create pid lock file %s (%s), exiting", + path, safe_strerror(errno)); umask(oldumask); exit(1); } else { @@ -59,23 +59,25 @@ pid_t pid_output(const char *path) lock.l_whence = SEEK_SET; if (fcntl(fd, F_SETLK, &lock) < 0) { - flog_err(LIB_ERR_SYSTEM_CALL, - "Could not lock pid_file %s (%s), exiting", - path, safe_strerror(errno)); + flog_err_sys(LIB_ERR_SYSTEM_CALL, + "Could not lock pid_file %s (%s), exiting", + path, safe_strerror(errno)); exit(1); } sprintf(buf, "%d\n", (int)pid); pidsize = strlen(buf); if ((tmp = write(fd, buf, pidsize)) != (int)pidsize) - flog_err(LIB_ERR_SYSTEM_CALL, - "Could not write pid %d to pid_file %s, rc was %d: %s", - (int)pid, path, tmp, safe_strerror(errno)); + flog_err_sys( + LIB_ERR_SYSTEM_CALL, + "Could not write pid %d to pid_file %s, rc was %d: %s", + (int)pid, path, tmp, safe_strerror(errno)); else if (ftruncate(fd, pidsize) < 0) - flog_err(LIB_ERR_SYSTEM_CALL, - "Could not truncate pid_file %s to %u bytes: %s", - path, (unsigned int)pidsize, - safe_strerror(errno)); + flog_err_sys( + LIB_ERR_SYSTEM_CALL, + "Could not truncate pid_file %s to %u bytes: %s", + path, (unsigned int)pidsize, + safe_strerror(errno)); } return pid; } -- cgit v1.2.3