openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

storage: Use VIR_DELETE_ELEMENT instead of open coding 

Replace the open coded array element deletion by our new helper.
This commit is contained in:
Peter Krempa 2013-12-19 12:24:26 +01:00
parent 94a26c7e88
commit cad3cf9a95
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/storage_driver.c
View File

@ -1565,17 +1565,8 @@ storageVolDelete(virStorageVolPtr obj,
VIR_INFO("Deleting volume '%s' from storage pool '%s'",
vol->name, pool->def->name);
virStorageVolDefFree(vol);
vol = NULL;
if (i < (pool->volumes.count - 1))
memmove(pool->volumes.objs + i, pool->volumes.objs + i + 1,
sizeof(*(pool->volumes.objs)) * (pool->volumes.count - (i + 1)));
if (VIR_REALLOC_N(pool->volumes.objs, pool->volumes.count - 1) < 0) {
; /* Failure to reduce memory allocation isn't fatal */
}
pool->volumes.count--;
VIR_DELETE_ELEMENT(pool->volumes.objs, pool->volumes.count, i);
break;
}
}