Fix a (valid) warning about comparison of char vs. int against EOF
Closes PR #796
This commit is contained in:
parent
9c7bb3787d
commit
863f77d827
|
@ -178,6 +178,7 @@ static int buspirate_getc(struct programmer_t *pgm)
|
||||||
static char *buspirate_readline_noexit(struct programmer_t *pgm, char *buf, size_t len)
|
static char *buspirate_readline_noexit(struct programmer_t *pgm, char *buf, size_t len)
|
||||||
{
|
{
|
||||||
char *buf_p;
|
char *buf_p;
|
||||||
|
int c;
|
||||||
long orig_serial_recv_timeout = serial_recv_timeout;
|
long orig_serial_recv_timeout = serial_recv_timeout;
|
||||||
|
|
||||||
/* Static local buffer - this may come handy at times */
|
/* Static local buffer - this may come handy at times */
|
||||||
|
@ -190,12 +191,12 @@ static char *buspirate_readline_noexit(struct programmer_t *pgm, char *buf, size
|
||||||
buf_p = buf;
|
buf_p = buf;
|
||||||
memset(buf, 0, len);
|
memset(buf, 0, len);
|
||||||
while (buf_p < (buf + len - 1)) { /* keep the very last byte == 0 */
|
while (buf_p < (buf + len - 1)) { /* keep the very last byte == 0 */
|
||||||
*buf_p = buspirate_getc(pgm);
|
*buf_p = c = buspirate_getc(pgm);
|
||||||
if (*buf_p == '\r')
|
if (c == '\r')
|
||||||
continue;
|
continue;
|
||||||
if (*buf_p == '\n')
|
if (c == '\n')
|
||||||
break;
|
break;
|
||||||
if (*buf_p == EOF) {
|
if (c == EOF) {
|
||||||
*buf_p = '\0';
|
*buf_p = '\0';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue