From be427e8b0b2bf119b2210d12d84348dc9bfdc3d4 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Fri, 12 Aug 2011 15:54:49 -0600
Subject: [PATCH] build: fix recent build failures

With gcc 4.5.1:

util/virpidfile.c: In function 'virPidFileAcquirePath':
util/virpidfile.c:308:66: error: nested extern declaration of '_gl_verify_function2' [-Wnested-externs]

Then in tests/commandtest.c, the new virPidFile APIs need to be used.

* src/util/virpidfile.c (virPidFileAcquirePath): Move verify to
top level.
* tests/commandtest.c: Use new pid APIs.
---
 src/util/virpidfile.c | 2 +-
 tests/commandtest.c   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 38cc7e28c6..7dd3c51ad9 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -299,13 +299,13 @@ cleanup:
 }
 
 
+verify(sizeof(pid_t) <= sizeof(unsigned int));
 
 int virPidFileAcquirePath(const char *path,
                           pid_t pid)
 {
     int fd = -1;
     char pidstr[INT_BUFSIZE_BOUND(pid)];
-    verify(sizeof(pid_t) <= sizeof(unsigned int));
 
     if (path[0] == '\0')
         return 0;
diff --git a/tests/commandtest.c b/tests/commandtest.c
index 9ba53b8e13..4a798fc91e 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -35,6 +35,7 @@
 #include "memory.h"
 #include "command.h"
 #include "virfile.h"
+#include "virpidfile.h"
 
 #ifdef WIN32
 
@@ -214,7 +215,7 @@ cleanup:
 static int test4(const void *unused ATTRIBUTE_UNUSED)
 {
     virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper");
-    char *pidfile = virFilePid(abs_builddir, "commandhelper");
+    char *pidfile = virPidFileBuildPath(abs_builddir, "commandhelper");
     pid_t pid;
     int ret = -1;
 
@@ -230,7 +231,7 @@ static int test4(const void *unused ATTRIBUTE_UNUSED)
         goto cleanup;
     }
 
-    if (virFileReadPid(abs_builddir, "commandhelper", &pid) < 0) {
+    if (virPidFileRead(abs_builddir, "commandhelper", &pid) < 0) {
         printf("cannot read pidfile\n");
         goto cleanup;
     }
@@ -668,7 +669,7 @@ cleanup:
 static int test18(const void *unused ATTRIBUTE_UNUSED)
 {
     virCommandPtr cmd = virCommandNewArgList("sleep", "100", NULL);
-    char *pidfile = virFilePid(abs_builddir, "commandhelper");
+    char *pidfile = virPidFileBuildPath(abs_builddir, "commandhelper");
     pid_t pid;
     int ret = -1;
 
@@ -686,7 +687,7 @@ static int test18(const void *unused ATTRIBUTE_UNUSED)
     }
     alarm(0);
 
-    if (virFileReadPid(abs_builddir, "commandhelper", &pid) < 0) {
+    if (virPidFileRead(abs_builddir, "commandhelper", &pid) < 0) {
         printf("cannot read pidfile\n");
         goto cleanup;
     }