zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / pid_output.c

diff --git a/lib/pid_output.c b/lib/pid_output.c
index c6120de8612c83fda7d93d0cef56bed6b841eb53..f5f7b1d17172bc822ac8ed5339c69526d9db28dd 100644 (file)
--- a/lib/pid_output.c
+++ b/lib/pid_output.c
@@ -42,7 +42,7 @@ 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_sys(LIB_ERR_SYSTEM_CALL,
+               flog_err_sys(EC_LIB_SYSTEM_CALL,
                             "Can't create pid lock file %s (%s), exiting",
                             path, safe_strerror(errno));
                umask(oldumask);
@@ -59,8 +59,8 @@ pid_t pid_output(const char *path)
                lock.l_whence = SEEK_SET;
 
                if (fcntl(fd, F_SETLK, &lock) < 0) {
-                       flog_err_sys(LIB_ERR_SYSTEM_CALL,
-                                    "Could not lock pid_file %s (%s), exiting",
+                       flog_err_sys(EC_LIB_SYSTEM_CALL,
+                                    "Could not lock pid_file %s (%s), exiting.  Please ensure that the daemon is not already running",
                                     path, safe_strerror(errno));
                        exit(1);
                }
@@ -69,12 +69,12 @@ pid_t pid_output(const char *path)
                pidsize = strlen(buf);
                if ((tmp = write(fd, buf, pidsize)) != (int)pidsize)
                        flog_err_sys(
-                               LIB_ERR_SYSTEM_CALL,
+                               EC_LIB_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_sys(
-                               LIB_ERR_SYSTEM_CALL,
+                               EC_LIB_SYSTEM_CALL,
                                "Could not truncate pid_file %s to %u bytes: %s",
                                path, (unsigned int)pidsize,
                                safe_strerror(errno));