aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean McBride <sean@rogue-research.com>2013-07-26 14:13:03 -0400
committerhjelmn <Nathan Hjelm hjelmn@cs.unm.edu>2013-07-30 10:43:49 -0600
commit4d198fe0cf7beac79ace20f12f8ddc0d84b10516 (patch)
treebed30f46e639ef18c084359fc8f1866da2ed622c
parent8f13c72409183c13a11044cbf70f15374262a870 (diff)
downloadandroid_external_libusbx-4d198fe0cf7beac79ace20f12f8ddc0d84b10516.tar.gz
android_external_libusbx-4d198fe0cf7beac79ace20f12f8ddc0d84b10516.tar.bz2
android_external_libusbx-4d198fe0cf7beac79ace20f12f8ddc0d84b10516.zip
fixed compiler warning about possible uninitialized use by zero initializing
-rw-r--r--libusb/os/darwin_usb.c3
-rw-r--r--libusb/version_nano.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index a24558c..d7f15a5 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -210,6 +210,7 @@ static int usb_setup_device_iterator (io_iterator_t *deviceIterator, UInt32 loca
return IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, deviceIterator);
}
+/* Returns 1 on success, 0 on failure. */
static int get_ioregistry_value_number (io_service_t service, CFStringRef property, CFNumberType type, void *p) {
CFTypeRef cfNumber = IORegistryEntryCreateCFProperty (service, property, kCFAllocatorDefault, 0);
int ret = 0;
@@ -735,7 +736,7 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da
static int darwin_get_cached_device(struct libusb_context *ctx, io_service_t service,
struct darwin_cached_device **cached_out) {
struct darwin_cached_device *new_device;
- UInt64 sessionID, parent_sessionID;
+ UInt64 sessionID = 0, parent_sessionID = 0;
int ret = LIBUSB_SUCCESS;
usb_device_t **device;
io_service_t parent;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 1198722..bba8538 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10792
+#define LIBUSB_NANO 10793