add braces to silence a warning; make explicit we return chars

This commit is contained in:
marschap
2007-10-04 14:02:28 +00:00
parent 9dc39fe10a
commit 884d6ae2c6
+4 -4
View File
@@ -252,9 +252,9 @@ serial_HD44780_senddata(PrivateData *p, unsigned char displayID, unsigned char f
if (flags == RS_DATA) { if (flags == RS_DATA) {
/* Do we need a DATA indicator byte? */ /* Do we need a DATA indicator byte? */
if ((SERIAL_IF.data_escape != '\0') && if ((SERIAL_IF.data_escape != '\0') &&
(ch >= SERIAL_IF.data_escape_min) && (((ch >= SERIAL_IF.data_escape_min) &&
(ch < SERIAL_IF.data_escape_max) || (ch < SERIAL_IF.data_escape_max)) ||
(SERIAL_IF.multiple_displays && displayID != lastdisplayID)) { (SERIAL_IF.multiple_displays && displayID != lastdisplayID))) {
write(p->fd, &SERIAL_IF.data_escape + displayID, 1); write(p->fd, &SERIAL_IF.data_escape + displayID, 1);
} }
write(p->fd, &ch, 1); write(p->fd, &ch, 1);
@@ -301,7 +301,7 @@ serial_HD44780_scankeypad(PrivateData *p)
hangcheck--; hangcheck--;
} }
} }
return 0; return '\0';
} }
void void