Page MenuHomeFreeBSD
Files F143962138

D51224.id.diff
No OneTemporary
Actions

D51224.id.diff
View Options

diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -207,6 +207,10 @@
ctx->devd_pipe = -1;
debug = getenv("LIBUSB_DEBUG");
+ ctx->log_cb = NULL;
+ ctx->no_discovery = false;
+ ctx->debug = LIBUSB_LOG_LEVEL_NONE;
+
if (debug != NULL) {
/*
* If LIBUSB_DEBUG is set, we'll honor that first and
@@ -226,24 +230,28 @@
*/
ctx->debug = 0;
}
- } else {
- /*
- * If the LIBUSB_OPTION_LOG_LEVEL is set, honor that.
- */
- for (int i = 0; i != num_options; i++) {
- if (option[i].option != LIBUSB_OPTION_LOG_LEVEL)
- continue;
+ }
- ctx->debug = (int)option[i].value.ival;
- if ((int64_t)ctx->debug == option[i].value.ival) {
- ctx->debug_fixed = 1;
- } else {
- free(ctx);
- return (LIBUSB_ERROR_INVALID_PARAM);
- }
- }
+ /*
+ * Set the default from default context then override by options
+ */
+ if (usbi_default_context) {
+ CTX_LOCK(usbi_default_context);
+ libusb_set_option(ctx, LIBUSB_OPTION_NO_DEVICE_DISCOVERY,
+ usbi_default_context->no_discovery);
+ /* libusb_set_option will check the if debug is fixed by
+ environment variable. If it is fixed, the override will not
+ take effect */
+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL,
+ usbi_default_context->debug);
+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_CB,
+ usbi_default_context->log_cb);
+ CTX_UNLOCK(usbi_default_context);
}
+ for (int i = 0; i < num_options; i++)
+ libusb_set_option(ctx, option[i].option, option[i].value);
+
TAILQ_INIT(&ctx->pollfds);
TAILQ_INIT(&ctx->tr_done);
TAILQ_INIT(&ctx->hotplug_cbh);
@@ -293,8 +301,6 @@
}
libusb10_add_pollfd(ctx, &ctx->ctx_poll, NULL, ctx->event, POLLIN);
- ctx->log_cb = NULL;
- ctx->no_discovery = false;
pthread_mutex_lock(&default_context_lock);
if (usbi_default_context == NULL) {

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 3, 3:29 PM (19 m, 4 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28418569
Default Alt Text
D51224.id.diff (1 KB)

Event Timeline