External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary check for non-NULL uuid

Browse Source 
The first thing we do in all these functions is to check uuid != NULL
and fail if it isn't.
This commit is contained in:
Jiri Denemark 2010-06-17 16:45:27 +02:00
parent 30ec755ecb
commit c5ec45a3a4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/datatypes.c
View File

@ -369,8 +369,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
ret->magic = VIR_DOMAIN_MAGIC; ret->magic = VIR_DOMAIN_MAGIC;
ret->conn = conn; ret->conn = conn;
ret->id = -1; ret->id = -1;
if (uuid != NULL) memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
ret->snapshots = virHashCreate(20); ret->snapshots = virHashCreate(20);
if (virHashAddEntry(conn->domains, uuidstr, ret) < 0) { if (virHashAddEntry(conn->domains, uuidstr, ret) < 0) {
@ -515,8 +514,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) {
} }
ret->magic = VIR_NETWORK_MAGIC; ret->magic = VIR_NETWORK_MAGIC;
ret->conn = conn; ret->conn = conn;
if (uuid != NULL) memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
if (virHashAddEntry(conn->networks, uuidstr, ret) < 0) { if (virHashAddEntry(conn->networks, uuidstr, ret) < 0) {
virMutexUnlock(&conn->lock); virMutexUnlock(&conn->lock);
@ -837,8 +835,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui
} }
ret->magic = VIR_STORAGE_POOL_MAGIC; ret->magic = VIR_STORAGE_POOL_MAGIC;
ret->conn = conn; ret->conn = conn;
if (uuid != NULL) memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
if (virHashAddEntry(conn->storagePools, uuidstr, ret) < 0) { if (virHashAddEntry(conn->storagePools, uuidstr, ret) < 0) {
virMutexUnlock(&conn->lock); virMutexUnlock(&conn->lock);
@ -1452,8 +1449,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid)
} }
ret->magic = VIR_NWFILTER_MAGIC; ret->magic = VIR_NWFILTER_MAGIC;
ret->conn = conn; ret->conn = conn;
if (uuid != NULL) memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
if (virHashAddEntry(conn->nwfilterPools, uuidstr, ret) < 0) { if (virHashAddEntry(conn->nwfilterPools, uuidstr, ret) < 0) {
virMutexUnlock(&conn->lock); virMutexUnlock(&conn->lock);