External/libvirt
1
0
Fork 0
Code

maint: avoid unbalanced {} across vbox #ifdef

Browse Source 
Emacs is fairly good about navigating across function and scope
boundaries, provided that the code has balanced {}.  The vbox
code, however, violated that premise, by splitting 'if () {'
across several #ifdef branches, but sharing the '} else {...}'
outside of the branches.  The extra lines of code is worth my
sanity, in a function that is already a horrendous 1100+ lines
long.

* src/vbox/vbox_tmpl.c (vboxDomainGetXMLDesc) Duplicate code
rather than trying to share else branch across #ifdef.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-18 14:10:27 -06:00
parent c0c8c1d7bb
commit b0b5422115
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vbox/vbox_tmpl.c
View File

@ -2649,6 +2649,9 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
VRDxServer->vtbl->GetPort(VRDxServer, &VRDPport); VRDxServer->vtbl->GetPort(VRDxServer, &VRDPport);
if (VRDPport) { if (VRDPport) {
def->graphics[def->ngraphics]->data.rdp.port = VRDPport; def->graphics[def->ngraphics]->data.rdp.port = VRDPport;
} else {
def->graphics[def->ngraphics]->data.rdp.autoport = true;
}
#elif VBOX_API_VERSION < 4000000 /* 3001000 <= VBOX_API_VERSION < 4000000 */ #elif VBOX_API_VERSION < 4000000 /* 3001000 <= VBOX_API_VERSION < 4000000 */
PRUnichar *VRDPport = NULL; PRUnichar *VRDPport = NULL;
VRDxServer->vtbl->GetPorts(VRDxServer, &VRDPport); VRDxServer->vtbl->GetPorts(VRDxServer, &VRDPport);
@ -2656,6 +2659,9 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
/* even if vbox supports mutilpe ports, single port for now here */ /* even if vbox supports mutilpe ports, single port for now here */
def->graphics[def->ngraphics]->data.rdp.port = PRUnicharToInt(VRDPport); def->graphics[def->ngraphics]->data.rdp.port = PRUnicharToInt(VRDPport);
VBOX_UTF16_FREE(VRDPport); VBOX_UTF16_FREE(VRDPport);
} else {
def->graphics[def->ngraphics]->data.rdp.autoport = true;
}
#else /* VBOX_API_VERSION >= 4000000 */ #else /* VBOX_API_VERSION >= 4000000 */
PRUnichar *VRDEPortsKey = NULL; PRUnichar *VRDEPortsKey = NULL;
PRUnichar *VRDEPortsValue = NULL; PRUnichar *VRDEPortsValue = NULL;
@ -2666,10 +2672,10 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
/* even if vbox supports mutilpe ports, single port for now here */ /* even if vbox supports mutilpe ports, single port for now here */
def->graphics[def->ngraphics]->data.rdp.port = PRUnicharToInt(VRDEPortsValue); def->graphics[def->ngraphics]->data.rdp.port = PRUnicharToInt(VRDEPortsValue);
VBOX_UTF16_FREE(VRDEPortsValue); VBOX_UTF16_FREE(VRDEPortsValue);
#endif /* VBOX_API_VERSION >= 4000000 */
} else { } else {
def->graphics[def->ngraphics]->data.rdp.autoport = true; def->graphics[def->ngraphics]->data.rdp.autoport = true;
} }
#endif /* VBOX_API_VERSION >= 4000000 */
def->graphics[def->ngraphics]->type = VIR_DOMAIN_GRAPHICS_TYPE_RDP; def->graphics[def->ngraphics]->type = VIR_DOMAIN_GRAPHICS_TYPE_RDP;