From: Eric Blake <eblake@redhat.com>
Date: Mon, 27 Mar 2017 13:11:26 +0000 (-0500)
Subject: util: fix build on RHEL 6
X-Git-Tag: v3.2.0-rc1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=044198476adbda1c6acf6b65e3277a7f93e09786;p=thirdparty%2Flibvirt.git

util: fix build on RHEL 6

We keep forgetting that older setups don't like 'index':

  CC     util/libvirt_util_la-virsysinfo.lo
cc1: warnings being treated as errors
util/virstoragefile.c: In function 'virStorageSourceFindByNodeName':
util/virstoragefile.c:3804: error: declaration of 'index' shadows a global declaration [-Wshadow]
/usr/include/string.h:489: error: shadowed declaration is here [-Wshadow]

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 0ac7079621..22cdb83e4c 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1,7 +1,7 @@
 /*
  * virstoragefile.c: file utility functions for FS storage backend
  *
- * Copyright (C) 2007-2014, 2016 Red Hat, Inc.
+ * Copyright (C) 2007-2017 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -3801,23 +3801,23 @@ virStorageSourceIsRelative(virStorageSourcePtr src)
 virStorageSourcePtr
 virStorageSourceFindByNodeName(virStorageSourcePtr top,
                                const char *nodeName,
-                               unsigned int *index)
+                               unsigned int *idx)
 {
     virStorageSourcePtr tmp;
 
-    if (index)
-        *index = 0;
+    if (idx)
+        *idx = 0;
 
     for (tmp = top; tmp; tmp = tmp->backingStore) {
         if ((tmp->nodeformat && STREQ(tmp->nodeformat, nodeName)) ||
             (tmp->nodebacking && STREQ(tmp->nodebacking, nodeName)))
             return tmp;
 
-        if (index)
-            (*index)++;
+        if (idx)
+            (*idx)++;
     }
 
-    if (index)
-        *index = 0;
+    if (idx)
+        *idx = 0;
     return NULL;
 }