From: Shawn Hoffman Date: Wed, 10 Apr 2024 14:15:41 +0000 (-0700) Subject: msvc: fix shadowed variable warning X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=c2b7c25e1272222c1719daea5761093fbc9c3010;p=libftdi msvc: fix shadowed variable warning --- diff --git a/src/ftdi_stream.c b/src/ftdi_stream.c index 4229d94..d146afd 100644 --- a/src/ftdi_stream.c +++ b/src/ftdi_stream.c @@ -245,13 +245,13 @@ ftdi_readstream(struct ftdi_context *ftdi, (ftdi->usb_read_timeout % 1000) * 1000 }; struct timeval now; - int err = libusb_handle_events_timeout(ftdi->usb_ctx, &timeout); - if (err == LIBUSB_ERROR_INTERRUPTED) + int xfer_err = libusb_handle_events_timeout(ftdi->usb_ctx, &timeout); + if (xfer_err == LIBUSB_ERROR_INTERRUPTED) /* restart interrupted events */ - err = libusb_handle_events_timeout(ftdi->usb_ctx, &timeout); + xfer_err = libusb_handle_events_timeout(ftdi->usb_ctx, &timeout); if (!state.result) { - state.result = err; + state.result = xfer_err; } if (state.activity == 0) state.result = 1;