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

virBitmapNewEmpty: Use g_new0 to allocate and remove error checking 

virBitmapNewEmpty can't fail now so we can make it obvious and fix all
callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-18 15:51:14 +01:00
parent 299796328c
commit 3ceb6951bd
4 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/virbitmap.c
View File

@ -110,17 +110,12 @@ virBitmapNew(size_t size)
*
* Allocate an empty bitmap. It can be used with self-expanding APIs.
*
* Returns a pointer to the allocated bitmap or NULL if memory cannot be
* allocated. Reports libvirt errors.
* Returns a pointer to the allocated bitmap.
*/
virBitmapPtr
virBitmapNewEmpty(void)
{
virBitmapPtr ret;
ignore_value(VIR_ALLOC(ret));
return ret;
return g_new0(virBitmap, 1);
}
@ -610,16 +605,13 @@ virBitmapParse(const char *str,
virBitmapPtr
virBitmapParseUnlimited(const char *str)
{
virBitmapPtr bitmap;
virBitmapPtr bitmap = virBitmapNewEmpty();
bool neg = false;
const char *cur = str;
char *tmp;
size_t i;
int start, last;
if (!(bitmap = virBitmapNewEmpty()))
return NULL;
if (!str)
goto error;

6
src/util/virhostcpu.c
View File

@ -336,8 +336,7 @@ virHostCPUParseNode(const char *node,
goto cleanup;
/* enumerate sockets in the node */
if (!(sockets_map = virBitmapNewEmpty()))
goto cleanup;
sockets_map = virBitmapNewEmpty();
while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) {
if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1)
@ -373,8 +372,7 @@ virHostCPUParseNode(const char *node,
goto cleanup;
for (i = 0; i < sock_max; i++)
if (!(cores_maps[i] = virBitmapNewEmpty()))
goto cleanup;
cores_maps[i] = virBitmapNewEmpty();
/* Iterate over all CPUs in the node, in ascending order */
for (cpu = 0; cpu < npresent_cpus; cpu++) {

3
src/util/virtpm.c
View File

@ -183,8 +183,7 @@ virTPMExecGetCaps(virCommandPtr cmd,
if (virCommandRun(cmd, &exitstatus) < 0)
return NULL;
if (!(bitmap = virBitmapNewEmpty()))
return NULL;
bitmap = virBitmapNewEmpty();
/* older version does not support --print-capabilties -- that's fine */
if (exitstatus != 0) {

8
tests/virbitmaptest.c
View File

@ -193,8 +193,7 @@ test4(const void *data G_GNUC_UNUSED)
/* 0. empty set */
if (!(bitmap = virBitmapNewEmpty()))
goto error;
bitmap = virBitmapNewEmpty();
if (virBitmapNextSetBit(bitmap, -1) != -1)
goto error;
@ -632,12 +631,9 @@ test11(const void *opaque)
static int
test12(const void *opaque G_GNUC_UNUSED)
{
virBitmapPtr map = NULL;
virBitmapPtr map = virBitmapNewEmpty();
int ret = -1;
if (!(map = virBitmapNewEmpty()))
return -1;
TEST_MAP(0, "");
if (virBitmapSetBitExpand(map, 128) < 0)