storage: don't shadow global 'wait' declaration

Rename the 'wait' parameter to 'loop'.
This silences the warning:
storage/storage_backend.c:1348:34: error: declaration of 'wait' shadows
a global declaration [-Werror=shadow]
and fixes the build with -Werror.
--
Note: loop is pool backwards.
This commit is contained in:
Ján Tomko 2012-10-23 13:33:21 +02:00 committed by Peter Krempa
parent 662f8a2ab3
commit b326765c80
2 changed files with 5 additions and 5 deletions

View File

@ -1339,13 +1339,13 @@ virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target,
* Typically target.path is one of the /dev/disk/by-XXX dirs
* with stable paths.
*
* If 'wait' is true, we use a timeout loop to give dynamic paths
* If 'loop' is true, we use a timeout loop to give dynamic paths
* a change to appear.
*/
char *
virStorageBackendStablePath(virStoragePoolObjPtr pool,
const char *devpath,
bool wait)
bool loop)
{
DIR *dh;
struct dirent *dent;
@ -1376,7 +1376,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool,
reopen:
if ((dh = opendir(pool->def->target.path)) == NULL) {
opentries++;
if (wait && errno == ENOENT && opentries < 50) {
if (loop && errno == ENOENT && opentries < 50) {
usleep(100 * 1000);
goto reopen;
}
@ -1415,7 +1415,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool,
VIR_FREE(stablepath);
}
if (wait && ++retry < 100) {
if (loop && ++retry < 100) {
usleep(100 * 1000);
goto retry;
}

View File

@ -131,7 +131,7 @@ virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target,
char *virStorageBackendStablePath(virStoragePoolObjPtr pool,
const char *devpath,
bool wait);
bool loop);
typedef int (*virStorageBackendListVolRegexFunc)(virStoragePoolObjPtr pool,
char **const groups,