提交 cad3cf9a 编写于 作者: P Peter Krempa

storage: Use VIR_DELETE_ELEMENT instead of open coding

Replace the open coded array element deletion by our new helper.
上级 94a26c7e
......@@ -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;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册