External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: rewrite if else functions to switch

Browse Source 
Pattern of using switch instead of a long if else construction is
used everywhere, so I used it here as well to make the code more
consistent (and remove that else after return). I also included
all the values from the enum.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-07-21 13:30:45 +02:00 committed by Martin Kletzander
parent d90c92adb6
commit 7437f35642
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/conf/domain_conf.c
View File

@ -8053,19 +8053,26 @@ static int
virDomainControllerModelTypeFromString(const virDomainControllerDef *def,
const char *model)
{
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
switch ((virDomainControllerType)def->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
return virDomainControllerModelSCSITypeFromString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
case VIR_DOMAIN_CONTROLLER_TYPE_USB:
return virDomainControllerModelUSBTypeFromString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
return virDomainControllerModelPCITypeFromString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
case VIR_DOMAIN_CONTROLLER_TYPE_IDE:
return virDomainControllerModelIDETypeFromString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
return virDomainControllerModelVirtioSerialTypeFromString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
case VIR_DOMAIN_CONTROLLER_TYPE_ISA:
return virDomainControllerModelISATypeFromString(model);
case VIR_DOMAIN_CONTROLLER_TYPE_FDC:
case VIR_DOMAIN_CONTROLLER_TYPE_SATA:
case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS:
case VIR_DOMAIN_CONTROLLER_TYPE_LAST:
return -1;
}
return -1;
}
@ -8074,19 +8081,26 @@ static const char *
virDomainControllerModelTypeToString(virDomainControllerDef *def,
int model)
{
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
switch ((virDomainControllerType)def->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
return virDomainControllerModelSCSITypeToString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
case VIR_DOMAIN_CONTROLLER_TYPE_USB:
return virDomainControllerModelUSBTypeToString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
return virDomainControllerModelPCITypeToString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
case VIR_DOMAIN_CONTROLLER_TYPE_IDE:
return virDomainControllerModelIDETypeToString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
return virDomainControllerModelVirtioSerialTypeToString(model);
else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
case VIR_DOMAIN_CONTROLLER_TYPE_ISA:
return virDomainControllerModelISATypeToString(model);
case VIR_DOMAIN_CONTROLLER_TYPE_FDC:
case VIR_DOMAIN_CONTROLLER_TYPE_SATA:
case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS:
case VIR_DOMAIN_CONTROLLER_TYPE_LAST:
return NULL;
}
return NULL;
}