yuzu/libusb
1
0
Fork 0
mirror of https://github.com/libusb/libusb synced 2024-11-21 14:29:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid assignments within if statements

Browse source 
Fixes all clang-tidy bugprone-assignment-in-if-condition warnings

References #1479
This commit is contained in:
Sean McBride 2024-04-09 13:34:55 -04:00 committed by Tormod Volden
parent a18a964aba
commit 9cf84577ce
5 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.clang-tidy
View file

@ -2,7 +2,6 @@
Checks: "-*,\ Checks: "-*,\
boost-*,\ boost-*,\
bugprone-*,\ bugprone-*,\
-bugprone-assignment-in-if-condition,\
-bugprone-branch-clone,\ -bugprone-branch-clone,\
-bugprone-easily-swappable-parameters,\ -bugprone-easily-swappable-parameters,\
-bugprone-misplaced-widening-cast,\ -bugprone-misplaced-widening-cast,\

22
examples/xusb.c
View file

@ -546,11 +546,14 @@ static int test_mass_storage(libusb_device_handle *handle, uint8_t endpoint_in,
get_sense(handle, endpoint_in, endpoint_out); get_sense(handle, endpoint_in, endpoint_out);
} else { } else {
display_buffer_hex(data, size); display_buffer_hex(data, size);
if ((binary_dump) && ((fd = fopen(binary_name, "w")) != NULL)) { if (binary_dump) {
if (fwrite(data, 1, (size_t)size, fd) != (unsigned int)size) { fd = fopen(binary_name, "w");
perr(" unable to write binary data\n"); if (fd != NULL) {
if (fwrite(data, 1, (size_t)size, fd) != (unsigned int)size) {
perr(" unable to write binary data\n");
}
fclose(fd);
} }
fclose(fd);
} }
} }
free(data); free(data);
@ -628,11 +631,14 @@ static int test_hid(libusb_device_handle *handle, uint8_t endpoint_in)
return -1; return -1;
} }
display_buffer_hex(hid_report_descriptor, (unsigned int)descriptor_size); display_buffer_hex(hid_report_descriptor, (unsigned int)descriptor_size);
if ((binary_dump) && ((fd = fopen(binary_name, "w")) != NULL)) { if (binary_dump) {
if (fwrite(hid_report_descriptor, 1, (size_t)descriptor_size, fd) != (size_t)descriptor_size) { fd = fopen(binary_name, "w");
printf(" Error writing descriptor to file\n"); if (fd != NULL) {
if (fwrite(hid_report_descriptor, 1, (size_t)descriptor_size, fd) != (size_t)descriptor_size) {
printf(" Error writing descriptor to file\n");
}
fclose(fd);
} }
fclose(fd);
} }
size = get_hid_record_size(hid_report_descriptor, descriptor_size, HID_REPORT_TYPE_FEATURE); size = get_hid_record_size(hid_report_descriptor, descriptor_size, HID_REPORT_TYPE_FEATURE);

6
libusb/os/darwin_usb.c
View file

@ -2701,7 +2701,8 @@ static int darwin_alloc_streams (struct libusb_device_handle *dev_handle, uint32
/* find the minimum number of supported streams on the endpoint list */ /* find the minimum number of supported streams on the endpoint list */
for (i = 0 ; i < num_endpoints ; ++i) { for (i = 0 ; i < num_endpoints ; ++i) {
if (0 != (rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface))) { rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface);
if (0 != rc) {
return rc; return rc;
} }
@ -2734,7 +2735,8 @@ static int darwin_free_streams (struct libusb_device_handle *dev_handle, unsigne
int rc; int rc;
for (int i = 0 ; i < num_endpoints ; ++i) { for (int i = 0 ; i < num_endpoints ; ++i) {
if (0 != (rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface))) rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface);
if (0 != rc)
return rc; return rc;
(*IOINTERFACE_V(cInterface, 550))->SupportsStreams (IOINTERFACE(cInterface), pipeRef, &supportsStreams); (*IOINTERFACE_V(cInterface, 550))->SupportsStreams (IOINTERFACE(cInterface), pipeRef, &supportsStreams);

2
libusb/version_nano.h
View file

@ -1 +1 @@
#define LIBUSB_NANO 11921 #define LIBUSB_NANO 11922

6
tests/stress_mt.c
View file

@ -114,7 +114,8 @@ static thread_return_t THREAD_CALL_TYPE init_and_exit(void * arg)
for (ti->iteration = 0; ti->iteration < ITERS && !ti->err; ti->iteration++) { for (ti->iteration = 0; ti->iteration < ITERS && !ti->err; ti->iteration++) {
libusb_context *ctx = NULL; libusb_context *ctx = NULL;
if ((ti->err = libusb_init_context(&ctx, /*options=*/NULL, /*num_options=*/0)) != 0) { ti->err = libusb_init_context(&ctx, /*options=*/NULL, /*num_options=*/0);
if (ti->err != 0) {
break; break;
} }
if (ti->enumerate) { if (ti->enumerate) {
@ -127,7 +128,8 @@ static thread_return_t THREAD_CALL_TYPE init_and_exit(void * arg)
for (int i = 0; i < ti->devcount && ti->err == 0; i++) { for (int i = 0; i < ti->devcount && ti->err == 0; i++) {
libusb_device *dev = devs[i]; libusb_device *dev = devs[i];
struct libusb_device_descriptor desc; struct libusb_device_descriptor desc;
if ((ti->err = libusb_get_device_descriptor(dev, &desc)) != 0) { ti->err = libusb_get_device_descriptor(dev, &desc);
if (ti->err != 0) {
break; break;
} }
if (no_access[i]) { if (no_access[i]) {