darwin: Fix clang static analyzer warning about a variable that's nev…

…er read Reformulate the loop in a way that the variable is read. References #1414
libusb · Apr 4, 2024 · 1c1bad9 · 1c1bad9
1 parent 4e246a7
commit 1c1bad9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
@@ -1242,17 +1242,18 @@ static bool get_device_port (io_service_t service, UInt8 *port) {
 
 /* Returns 1 on success, 0 on failure. */
 static bool get_device_parent_sessionID(io_service_t service, UInt64 *parent_sessionID) {
- IOReturn kresult;
- io_service_t parent;
-
  /* Walk up the tree in the IOService plane until we find a parent that has a sessionID */
- parent = service;
- while((kresult = IORegistryEntryGetParentEntry (parent, kIOUSBPlane, &parent)) == kIOReturnSuccess) {
+ io_service_t parent = service;
+ do {
+ IOReturn kresult = IORegistryEntryGetParentEntry (parent, kIOUSBPlane, &parent);
+ if (kresult != kIOReturnSuccess) {
+ break;
+ }
  if (get_ioregistry_value_number (parent, CFSTR("sessionID"), kCFNumberSInt64Type, parent_sessionID)) {
  /* Success */
  return true;
  }
- }
+ } while (true);
 
  /* We ran out of parents */
  return false;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11891
+#define LIBUSB_NANO 11892