core: Pass context to backend when calling exit() function

Providing the context to the exit() function will allow backends to
perform context-specific teardown, if needed.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/core.c b/libusb/core.c
index f21a74f..7147550 100644 (file)
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -2183,7 +2183,7 @@ int API_EXPORTED libusb_init(libusb_context **context)
 
 err_backend_exit:
        if (usbi_backend.exit)
-               usbi_backend.exit();
+               usbi_backend.exit(ctx);
 err_free_ctx:
        if (ctx == usbi_default_context) {
                usbi_default_context = NULL;
@@ -2274,7 +2274,7 @@ void API_EXPORTED libusb_exit(struct libusb_context *ctx)
 
        usbi_io_exit(ctx);
        if (usbi_backend.exit)
-               usbi_backend.exit();
+               usbi_backend.exit(ctx);
 
        usbi_mutex_destroy(&ctx->open_devs_lock);
        usbi_mutex_destroy(&ctx->usb_devs_lock);

diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index 2818125..919a921 100644 (file)
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -614,7 +614,7 @@ struct usbi_os_backend {
         *
         * This function is called when the user deinitializes the library.
         */
-       void (*exit)(void);
+       void (*exit)(struct libusb_contex *ctx);
 
        /* Enumerate all the USB devices on the system, returning them in a list
         * of discovered devices.

diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index 05aa090..9121163 100644 (file)
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -555,7 +555,8 @@ static int darwin_init(struct libusb_context *ctx) {
   return rc;
 }
 
-static void darwin_exit (void) {
+static void darwin_exit (struct libusb_context *ctx) {
+  UNUSED(ctx);
   if (libusb_darwin_atomic_fetch_add (&initCount, -1) == 1) {
 #if !OSX_USE_CLOCK_GETTIME
     mach_port_deallocate(mach_task_self(), clock_realtime);

diff --git a/libusb/os/haiku_usb_raw.cpp b/libusb/os/haiku_usb_raw.cpp
index f480b2d..d1609aa 100644 (file)
--- a/libusb/os/haiku_usb_raw.cpp
+++ b/libusb/os/haiku_usb_raw.cpp
@@ -38,8 +38,9 @@ haiku_init(struct libusb_context *ctx)
 }
 
 static void
-haiku_exit(void)
+haiku_exit(struct libusb_context *ctx)
 {
+       UNUSED(ctx);
        if (atomic_add(&gInitCount, -1) == 1)
                gUsbRoster.Stop();
 }

diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 6a28554..98cce75 100644 (file)
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -486,8 +486,9 @@ static int op_init(struct libusb_context *ctx)
        return r;
 }
 
-static void op_exit(void)
+static void op_exit(struct libusb_context *ctx)
 {
+       UNUSED(ctx);
        usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
        assert(init_count != 0);
        if (!--init_count) {

diff --git a/libusb/os/sunos_usb.c b/libusb/os/sunos_usb.c
index a21fd36..ab3325e 100644 (file)
--- a/libusb/os/sunos_usb.c
+++ b/libusb/os/sunos_usb.c
@@ -42,7 +42,7 @@
  * Backend functions
  */
 static int sunos_init(struct libusb_context *);
-static void sunos_exit(void);
+static void sunos_exit(struct libusb_context *);
 static int sunos_get_device_list(struct libusb_context *,
     struct discovered_devs **);
 static int sunos_open(struct libusb_device_handle *);
@@ -79,7 +79,7 @@ static int sunos_init(struct libusb_context *ctx)
        return (LIBUSB_SUCCESS);
 }
 
-static void sunos_exit(void)
+static void sunos_exit(struct libusb_context *ctx)
 {
        usbi_dbg("");
 }

diff --git a/libusb/os/wince_usb.c b/libusb/os/wince_usb.c
index a691c9e..5498b91 100644 (file)
--- a/libusb/os/wince_usb.c
+++ b/libusb/os/wince_usb.c
@@ -239,10 +239,11 @@ init_exit: // Holds semaphore here.
        return r;
 }
 
-static void wince_exit(void)
+static void wince_exit(struct libusb_context *ctx)
 {
        HANDLE semaphore;
        TCHAR sem_name[11 + 8 + 1]; // strlen("libusb_init") + (32-bit hex PID) + '\0'
+       UNUSED(ctx);
 
        _stprintf(sem_name, _T("libusb_init%08X"), (unsigned int)(GetCurrentProcessId() & 0xFFFFFFFF));
        semaphore = CreateSemaphore(NULL, 1, 1, sem_name);

diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c
index 047ce51..42d1368 100644 (file)
--- a/libusb/os/windows_usbdk.c
+++ b/libusb/os/windows_usbdk.c
@@ -371,8 +371,9 @@ func_exit:
        return r;
 }
 
-static void usbdk_exit(void)
+static void usbdk_exit(struct libusb_context *ctx)
 {
+       UNUSED(ctx);
        if (--concurrent_usage < 0) {
                windows_common_exit();
                exit_polling();

diff --git a/libusb/os/windows_winusb.c b/libusb/os/windows_winusb.c
index deb8d68..a1319b7 100644 (file)
--- a/libusb/os/windows_winusb.c
+++ b/libusb/os/windows_winusb.c
@@ -1656,11 +1656,12 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered
 /*
  * exit: libusb backend deinitialization function
  */
-static void windows_exit(void)
+static void windows_exit(struct libusb_context *ctx)
 {
        int i;
        HANDLE semaphore;
        char sem_name[11 + 8 + 1]; // strlen("libusb_init") + (32-bit hex PID) + '\0'
+       UNUSED(ctx);
 
        sprintf(sem_name, "libusb_init%08X", (unsigned int)(GetCurrentProcessId() & 0xFFFFFFFF));
        semaphore = CreateSemaphoreA(NULL, 1, 1, sem_name);

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 2971829..3d40961 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11211
+#define LIBUSB_NANO 11212