avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Silence sign-compare warnings in ser_avrdoper.c

This commit is contained in:
Stefan Rueger 2023-01-11 19:01:00 +00:00
parent c6b2f12c04
commit 3521c9d9fb
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ser_avrdoper.c
View File

@ -55,7 +55,7 @@
#define USB_VENDOR_ID 0x16c0 #define USB_VENDOR_ID 0x16c0
#define USB_PRODUCT_ID 0x05df #define USB_PRODUCT_ID 0x05df
static int reportDataSizes[4] = {13, 29, 61, 125}; static const int reportDataSizes[4] = {13, 29, 61, 125};
static unsigned char avrdoperRxBuffer[280]; /* buffer for receive data */ static unsigned char avrdoperRxBuffer[280]; /* buffer for receive data */
static int avrdoperRxLength = 0; /* amount of valid bytes in rx buffer */ static int avrdoperRxLength = 0; /* amount of valid bytes in rx buffer */
@ -232,7 +232,7 @@ static void avrdoper_close(union filedescriptor *fdp)
static int chooseDataSize(int len) static int chooseDataSize(int len)
{ {
int i; size_t i;
for(i = 0; i < sizeof(reportDataSizes)/sizeof(reportDataSizes[0]); i++){ for(i = 0; i < sizeof(reportDataSizes)/sizeof(reportDataSizes[0]); i++){
if(reportDataSizes[i] >= len) if(reportDataSizes[i] >= len)
@ -243,13 +243,17 @@ static int chooseDataSize(int len)
static int avrdoper_send(const union filedescriptor *fdp, const unsigned char *buf, size_t buflen) static int avrdoper_send(const union filedescriptor *fdp, const unsigned char *buf, size_t buflen)
{ {
if(buflen > INT_MAX) {
pmsg_error("%s() called with too large buflen = %lu\n", __func__, (unsigned long) buflen);
return -1;
}
if(verbose > 3) if(verbose > 3)
dumpBlock("Send", buf, buflen); dumpBlock("Send", buf, buflen);
while(buflen > 0){ while(buflen > 0){
unsigned char buffer[256]; unsigned char buffer[256];
int rval, lenIndex = chooseDataSize(buflen); int rval, lenIndex = chooseDataSize(buflen);
int thisLen = buflen > reportDataSizes[lenIndex] ? int thisLen = (int) buflen > reportDataSizes[lenIndex]?
reportDataSizes[lenIndex] : buflen; reportDataSizes[lenIndex]: (int) buflen;
buffer[0] = lenIndex + 1; /* report ID */ buffer[0] = lenIndex + 1; /* report ID */
buffer[1] = thisLen; buffer[1] = thisLen;
memcpy(buffer + 2, buf, thisLen); memcpy(buffer + 2, buf, thisLen);
@ -290,7 +294,7 @@ static int avrdoperFillBuffer(const union filedescriptor *fdp) {
bytesPending = buffer[1] - len; /* amount still buffered */ bytesPending = buffer[1] - len; /* amount still buffered */
if(len > buffer[1]) /* cut away padding */ if(len > buffer[1]) /* cut away padding */
len = buffer[1]; len = buffer[1];
if(avrdoperRxLength + len > sizeof(avrdoperRxBuffer)){ if(avrdoperRxLength + len > (int) sizeof(avrdoperRxBuffer)){
pmsg_error("buffer overflow\n"); pmsg_error("buffer overflow\n");
return -1; return -1;
} }