oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/winmm: eliminate "goto"

Browse Source
This commit is contained in:
Max Kellermann 2015-03-05 09:04:02 +01:00
parent 2f41eba100
commit a261442279
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/plugins/WinmmOutputPlugin.cxx
View File

@ -96,8 +96,13 @@ get_device_id(const char *device_name, UINT *device_id, Error &error)
char *endptr;
UINT id = strtoul(device_name, &endptr, 0);
if (endptr > device_name && *endptr == 0) {
if (id >= numdevs)
goto fail;
if (id >= numdevs) {
error.Format(winmm_output_domain,
"device \"%s\" is not found",
device_name);
return false;
}
*device_id = id;
return true;
}
@ -116,7 +121,6 @@ get_device_id(const char *device_name, UINT *device_id, Error &error)
}
}
fail:
error.Format(winmm_output_domain,
"device \"%s\" is not found", device_name);
return false;