Squashed 'libusb/' changes from c5aec6b..6bf2db6

6bf2db6 netbsd: Add error number to debug output
cfc6694 netbsd: Print control transfer request debug values in hex
9891cf2 netbsd/openbsd: Remove extraneous parentheses around ioctl call
0a29e4f netbsd/openbsd: Drop parentheses around return values
681a851 sunos: Return error if OS paths hit their limits
7218b0d sunos: Fix error detection in sunos_submit_transfer()
ba83b68 core: Fix always-true condition in log callback function setting
76df571 core: Avoid crash due to premature va_end
8450cc9 Revert "windows: Fix off-by-one error in HID backend for devices without report IDs"
cc498de windows: Refactor parsing of MI_XX string taking into account it's 16-based
07441f5 Fix github action warnings
a8a70f6 Fix build errors of tests with --enable-debug-log
3bace66 Fix build error with --enable-debug-log
7c169b8 Add github action build for --enable-debug-log

git-subtree-dir: libusb
git-subtree-split: 6bf2db6

Author: Youw

.github/workflows/linux.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job
       # can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup prerequisites
         shell: bash
@@ -35,5 +35,9 @@ jobs:
         shell: bash
         run: .private/ci-build.sh --build-dir build-udev -- --enable-udev
 
+      - name: debug-log
+        shell: bash
+        run: .private/ci-build.sh --build-dir build-debug -- --enable-debug-log
+
       - name: umockdev test
         run: .private/ci-container-build.sh docker.io/amd64/ubuntu:rolling

.github/workflows/macos.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job
       # can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup prerequisites
         shell: bash

.github/workflows/msys2.yml

@@ -8,7 +8,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64

.github/workflows/msys2_clang32.yml

@@ -8,7 +8,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: clang32

.github/workflows/msys2_clang64.yml

@@ -8,7 +8,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: clang64

libusb/core.c

@@ -2302,6 +2302,7 @@ int API_EXPORTEDV libusb_set_option(libusb_context *ctx,
 	va_list ap;
 
 	va_start(ap, option);
+
 	if (LIBUSB_OPTION_LOG_LEVEL == option) {
 		arg = va_arg(ap, int);
 		if (arg < LIBUSB_LOG_LEVEL_NONE || arg > LIBUSB_LOG_LEVEL_DEBUG) {
@@ -2311,59 +2312,65 @@ int API_EXPORTEDV libusb_set_option(libusb_context *ctx,
 	if (LIBUSB_OPTION_LOG_CB == option) {
 		log_cb = (libusb_log_cb) va_arg(ap, libusb_log_cb);
 	}
-	va_end(ap);
 
-	if (LIBUSB_SUCCESS != r) {
-		return r;
-	}
+	do {
+		if (LIBUSB_SUCCESS != r) {
+			break;
+		}
 
-	if (option >= LIBUSB_OPTION_MAX) {
-		return LIBUSB_ERROR_INVALID_PARAM;
-	}
+		if (option >= LIBUSB_OPTION_MAX) {
+			r = LIBUSB_ERROR_INVALID_PARAM;
+			break;
+		}
 
-	if (NULL == ctx) {
-		usbi_mutex_static_lock(&default_context_lock);
-		default_context_options[option].is_set = 1;
-		if (LIBUSB_OPTION_LOG_LEVEL == option) {
-			default_context_options[option].arg.ival = arg;
-		} else if (LIBUSB_OPTION_LOG_CB) {
-			default_context_options[option].arg.log_cbval = log_cb;
+		if (NULL == ctx) {
+			usbi_mutex_static_lock(&default_context_lock);
+			default_context_options[option].is_set = 1;
+			if (LIBUSB_OPTION_LOG_LEVEL == option) {
+				default_context_options[option].arg.ival = arg;
+			} else if (LIBUSB_OPTION_LOG_CB == option) {
+				default_context_options[option].arg.log_cbval = log_cb;
+			}
+			usbi_mutex_static_unlock(&default_context_lock);
 		}
-		usbi_mutex_static_unlock(&default_context_lock);
-	}
 
-	ctx = usbi_get_context(ctx);
-	if (NULL == ctx) {
-		libusb_set_log_cb_internal(NULL, log_cb, LIBUSB_LOG_CB_GLOBAL);
-		return LIBUSB_SUCCESS;
-	}
+		ctx = usbi_get_context(ctx);
+		if (NULL == ctx) {
+			libusb_set_log_cb_internal(NULL, log_cb, LIBUSB_LOG_CB_GLOBAL);
+			break;
+		}
 
-	switch (option) {
-	case LIBUSB_OPTION_LOG_LEVEL:
+		switch (option) {
+		case LIBUSB_OPTION_LOG_LEVEL:
 #if defined(ENABLE_LOGGING) && !defined(ENABLE_DEBUG_LOGGING)
-		if (!ctx->debug_fixed)
-			ctx->debug = (enum libusb_log_level)arg;
+			if (!ctx->debug_fixed)
+				ctx->debug = (enum libusb_log_level)arg;
 #endif
-		break;
+			break;
 
-		/* Handle all backend-specific options here */
-	case LIBUSB_OPTION_USE_USBDK:
-	case LIBUSB_OPTION_NO_DEVICE_DISCOVERY:
-	case LIBUSB_OPTION_WINUSB_RAW_IO:
-		if (usbi_backend.set_option)
-			return usbi_backend.set_option(ctx, option, ap);
+			/* Handle all backend-specific options here */
+		case LIBUSB_OPTION_USE_USBDK:
+		case LIBUSB_OPTION_NO_DEVICE_DISCOVERY:
+		case LIBUSB_OPTION_WINUSB_RAW_IO:
+			if (usbi_backend.set_option) {
+				r = usbi_backend.set_option(ctx, option, ap);
+				break;
+			}
 
-		return LIBUSB_ERROR_NOT_SUPPORTED;
-		break;
+			r = LIBUSB_ERROR_NOT_SUPPORTED;
+			break;
 
-	case LIBUSB_OPTION_LOG_CB:
-		libusb_set_log_cb_internal(ctx, log_cb, LIBUSB_LOG_CB_CONTEXT);
-		break;
-	default:
-		return LIBUSB_ERROR_INVALID_PARAM;
-	}
+		case LIBUSB_OPTION_LOG_CB:
+			libusb_set_log_cb_internal(ctx, log_cb, LIBUSB_LOG_CB_CONTEXT);
+			break;
+		default:
+			r = LIBUSB_ERROR_INVALID_PARAM;
+		}
+	} while (0);
 
-	return LIBUSB_SUCCESS;;
+	va_end(ap);
+
+	return r;
 }
 
 #if defined(ENABLE_LOGGING) && !defined(ENABLE_DEBUG_LOGGING)
@@ -2448,8 +2455,8 @@ int API_EXPORTED libusb_init_context(libusb_context **ctx, const struct libusb_i
 		return LIBUSB_ERROR_NO_MEM;
 	}
 
-	_ctx->debug = LIBUSB_LOG_LEVEL_NONE;
 #if defined(ENABLE_LOGGING) && !defined(ENABLE_DEBUG_LOGGING)
+	_ctx->debug = LIBUSB_LOG_LEVEL_NONE;
 	if (getenv("LIBUSB_DEBUG")) {
 		_ctx->debug = get_env_debug_level();
 		_ctx->debug_fixed = 1;