encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compile warning C4127: conditional expression is constant

This commit is contained in:
Sam Lantinga 2020-11-21 18:37:56 -08:00
parent 63b52e8e67
commit 49f7be6d0d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hidapi/windows/hid.c
View File

@ -720,15 +720,16 @@ static int hid_write_timeout(hid_device *dev, const unsigned char *data, size_t
* to Sony game controllers over Bluetooth, where there's a CRC at the end which * to Sony game controllers over Bluetooth, where there's a CRC at the end which
* must not be tampered with. * must not be tampered with.
*/ */
const BOOL write_exact_size = TRUE; #if 1
buf = (unsigned char *) data;
#else
/* Make sure the right number of bytes are passed to WriteFile. Windows /* Make sure the right number of bytes are passed to WriteFile. Windows
expects the number of bytes which are in the _longest_ report (plus expects the number of bytes which are in the _longest_ report (plus
one for the report number) bytes even if the data is a report one for the report number) bytes even if the data is a report
which is shorter than that. Windows gives us this value in which is shorter than that. Windows gives us this value in
caps.OutputReportByteLength. If a user passes in fewer bytes than this, caps.OutputReportByteLength. If a user passes in fewer bytes than this,
create a temporary buffer which is the proper size. */ create a temporary buffer which is the proper size. */
if (write_exact_size || length >= dev->output_report_length) { if (length >= dev->output_report_length) {
/* The user passed the right number of bytes. Use the buffer as-is. */ /* The user passed the right number of bytes. Use the buffer as-is. */
buf = (unsigned char *) data; buf = (unsigned char *) data;
} else { } else {
@ -739,6 +740,7 @@ static int hid_write_timeout(hid_device *dev, const unsigned char *data, size_t
memset(buf + length, 0, dev->output_report_length - length); memset(buf + length, 0, dev->output_report_length - length);
length = dev->output_report_length; length = dev->output_report_length;
} }
#endif
if (length > 512) if (length > 512)
{ {
return hid_write_output_report( dev, data, stashed_length ); return hid_write_output_report( dev, data, stashed_length );