Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Simplify error handling in sc_aoa_init()

Browse source 
Use goto to avoid many repetitions.
This commit is contained in:
Romain Vimont 2022-01-21 21:55:41 +01:00
parent 241a587e61
commit 308a1f8192
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/aoa_hid.c
View file

@ -131,31 +131,22 @@ sc_aoa_init(struct sc_aoa *aoa, const char *serial,
} }
if (!sc_cond_init(&aoa->event_cond)) { if (!sc_cond_init(&aoa->event_cond)) {
sc_mutex_destroy(&aoa->mutex); goto error_destroy_mutex;
return false;
} }
if (libusb_init(&aoa->usb_context) != LIBUSB_SUCCESS) { if (libusb_init(&aoa->usb_context) != LIBUSB_SUCCESS) {
sc_cond_destroy(&aoa->event_cond); goto error_destroy_cond;
sc_mutex_destroy(&aoa->mutex);
return false;
} }
aoa->usb_device = sc_aoa_find_usb_device(serial); aoa->usb_device = sc_aoa_find_usb_device(serial);
if (!aoa->usb_device) { if (!aoa->usb_device) {
LOGW("USB device of serial %s not found", serial); LOGW("USB device of serial %s not found", serial);
libusb_exit(aoa->usb_context); goto error_exit_libusb;
sc_mutex_destroy(&aoa->mutex);
sc_cond_destroy(&aoa->event_cond);
return false;
} }
if (sc_aoa_open_usb_handle(aoa->usb_device, &aoa->usb_handle) < 0) { if (sc_aoa_open_usb_handle(aoa->usb_device, &aoa->usb_handle) < 0) {
LOGW("Open USB handle failed"); LOGW("Open USB handle failed");
libusb_unref_device(aoa->usb_device); goto error_unref_device;
libusb_exit(aoa->usb_context);
sc_cond_destroy(&aoa->event_cond);
sc_mutex_destroy(&aoa->mutex);
return false; return false;
} }
@ -163,6 +154,16 @@ sc_aoa_init(struct sc_aoa *aoa, const char *serial,
aoa->acksync = acksync; aoa->acksync = acksync;
return true; return true;
error_unref_device:
libusb_unref_device(aoa->usb_device);
error_exit_libusb:
libusb_exit(aoa->usb_context);
error_destroy_cond:
sc_cond_destroy(&aoa->event_cond);
error_destroy_mutex:
sc_mutex_destroy(&aoa->mutex);
return false;
} }
void void