shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

getOldStyleBlockDevice: Adjust formatting

Browse Source 
Instead of initializing return value to zero (success) and overwriting
it on every failure just before the control jumps onto 'out' label,
let's initialize to an error value and set to zero only when we are
sure about the success. Just follow the pattern we have in the rest of
the code.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-06-15 13:13:27 +02:00
parent 71b66bec2b
commit c4bdfafcbb
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/storage/storage_backend_scsi.c
View File

@ -301,27 +301,25 @@ getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED,
char **block_device) char **block_device)
{ {
char *blockp = NULL; char *blockp = NULL;
int retval = 0; int retval = -1;
/* old-style; just parse out the sd */ /* old-style; just parse out the sd */
blockp = strrchr(block_name, ':'); if (!(blockp = strrchr(block_name, ':'))) {
if (blockp == NULL) {
/* Hm, wasn't what we were expecting; have to give up */ /* Hm, wasn't what we were expecting; have to give up */
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to parse block name %s"), _("Failed to parse block name %s"),
block_name); block_name);
retval = -1; goto cleanup;
} else { } else {
blockp++; blockp++;
if (VIR_STRDUP(*block_device, blockp) < 0) { if (VIR_STRDUP(*block_device, blockp) < 0)
retval = -1; goto cleanup;
goto out;
}
VIR_DEBUG("Block device is '%s'", *block_device); VIR_DEBUG("Block device is '%s'", *block_device);
} }
out: retval = 0;
cleanup:
return retval; return retval;
} }