提交 04419847 编写于 作者: E Eric Blake

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: NEric Blake <eblake@redhat.com>
上级 ad589e1f
/*
* 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;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册