[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] build: avoid 'devname' for BSD

Commit 21b5daa1 was the last time we cleaned this up.

* tools/virt-host-validate-common.c (virHostValidateDevice):
Rename local variable.

Pushing under the build-breaker rule.
I considered adding a syntax-check rule to catch this, but we use
'devname' in enough other places where the name pollution was not
happening as to make writing a rule difficult.

 tools/virt-host-validate-common.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index bd118be..066343c 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -113,13 +113,13 @@ void virHostMsgFail(virHostValidateLevel level,

 int virHostValidateDevice(const char *hvname,
-                          const char *devname,
+                          const char *dev_name,
                           virHostValidateLevel level,
                           const char *hint)
-    virHostMsgCheck(hvname, "for device %s", devname);
+    virHostMsgCheck(hvname, "for device %s", dev_name);

-    if (access(devname, R_OK|W_OK) < 0) {
+    if (access(dev_name, R_OK|W_OK) < 0) {
         virHostMsgFail(level, hint);
         return -1;

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]