[libvirt PATCH 2/6] util: introduce virPidFileAcquirePathFull

For now, add the 'Full' suffix to virPidFileAcquirePath and make virPidFileAcquirePath a 'wrapper' around it. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/libvirt_private.syms | 1 + src/util/virpidfile.c | 14 +++++++++++--- src/util/virpidfile.h | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d5b1b9cb72..4959dcec67 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3126,6 +3126,7 @@ virPerfReadEvent; # util/virpidfile.h virPidFileAcquire; virPidFileAcquirePath; +virPidFileAcquirePathFull; virPidFileBuildPath; virPidFileConstructPath; virPidFileDelete; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 5448a8652d..742531379e 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -362,9 +362,9 @@ int virPidFileDelete(const char *dir, return virPidFileDeletePath(pidfile); } -int virPidFileAcquirePath(const char *path, - bool waitForLock, - pid_t pid) +int virPidFileAcquirePathFull(const char *path, + bool waitForLock, + pid_t pid) { int fd = -1; char pidstr[VIR_INT64_STR_BUFLEN]; @@ -445,6 +445,14 @@ int virPidFileAcquirePath(const char *path, } +int virPidFileAcquirePath(const char *path, + bool waitForLock, + pid_t pid) +{ + return virPidFileAcquirePathFull(path, waitForLock, pid); +} + + int virPidFileAcquire(const char *dir, const char *name, pid_t pid) diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index ff4d31c9fd..8c70f883be 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -56,6 +56,9 @@ int virPidFileDelete(const char *dir, const char *name); +int virPidFileAcquirePathFull(const char *path, + bool waitForLock, + pid_t pid) G_GNUC_WARN_UNUSED_RESULT; int virPidFileAcquirePath(const char *path, bool waitForLock, pid_t pid) G_GNUC_WARN_UNUSED_RESULT; -- 2.39.2