address @tormodvolden comments, correct error handling within windows…

…_stop_event_monitor. TO BE SQUASHED WITH PREVIOUS COMMIT
sonatique · Feb 13, 2024 · 98e198c · 98e198c
1 parent 8ef20c7
commit 98e198c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/libusb/os/windows_hotplug.c b/libusb/os/windows_hotplug.c
@@ -53,23 +53,22 @@ int windows_stop_event_monitor(void)
 	if (!SUCCEEDED(SendMessage(windows_event_hwnd, WM_CLOSE, 0, 0)))
 	{
 		log_error("SendMessage");
+		return LIBUSB_ERROR_OTHER;
 	}
 
-	int ret = LIBUSB_SUCCESS;
-
 	if (WaitForSingleObject(windows_event_thread_handle, INFINITE) != WAIT_OBJECT_0)
 	{
 		log_error("WaitForSingleObject");
-		ret = LIBUSB_ERROR_OTHER;
+		return LIBUSB_ERROR_OTHER;
 	}
 
 	if (!CloseHandle(windows_event_thread_handle))
 	{
 		log_error("CloseHandle");
-		ret = LIBUSB_ERROR_OTHER;
+		return LIBUSB_ERROR_OTHER;
 	}
 
-	return ret;
+	return LIBUSB_SUCCESS;
 }
 
 /* We leverage the backend's get_device_list method to discover new/gone devices.

diff --git a/libusb/os/windows_winusb.c b/libusb/os/windows_winusb.c
@@ -1899,7 +1899,7 @@ static int winusb_get_device_list(struct libusb_context *ctx)
 				unref_list[unref_cur++] = dev;
 			}
 
-			dont_track_unref:
+		dont_track_unref:
 			// Setup device
 			switch (pass_type) {
 			case HUB_PASS: