LiXiaoqi/minmea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minmea.c: ctype.h requires integer, not signed char

Browse Source
This commit is contained in:
Kosma Moczek 2014-02-14 17:17:59 +01:00
parent 03fd0b399c
commit 9595e51287
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
minmea.c
View File

@ -31,7 +31,7 @@ bool minmea_check(const char *sentence)
return false; return false;
// The optional checksum is an XOR of all bytes between "$" and "*". // The optional checksum is an XOR of all bytes between "$" and "*".
while (*sentence && *sentence != '*' && isprint(*sentence)) while (*sentence && *sentence != '*' && isprint((unsigned char) *sentence))
checksum ^= *sentence++; checksum ^= *sentence++;
if (*sentence == '*') { if (*sentence == '*') {
@ -58,7 +58,7 @@ bool minmea_check(const char *sentence)
} }
static inline bool minmea_isfield(char c) { static inline bool minmea_isfield(char c) {
return isprint(c) && c != ',' && c != '*'; return isprint((unsigned char) c) && c != ',' && c != '*';
} }
bool minmea_scan(const char *sentence, const char *format, ...) bool minmea_scan(const char *sentence, const char *format, ...)
@ -120,7 +120,7 @@ bool minmea_scan(const char *sentence, const char *format, ...)
sign = 1; sign = 1;
} else if (*field == '-' && !sign && value == -1) { } else if (*field == '-' && !sign && value == -1) {
sign = -1; sign = -1;
} else if (isdigit(*field)) { } else if (isdigit((unsigned char) *field)) {
if (value == -1) if (value == -1)
value = 0; value = 0;
value = (10 * value) + (*field - '0'); value = (10 * value) + (*field - '0');
@ -185,7 +185,7 @@ bool minmea_scan(const char *sentence, const char *format, ...)
int d = -1, m = -1, y = -1; int d = -1, m = -1, y = -1;
// Always six digits. // Always six digits.
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
if (!isdigit(field[i])) if (!isdigit((unsigned char) field[i]))
goto end_D; goto end_D;
d = strtol((char[]) {field[0], field[1], '\0'}, NULL, 10); d = strtol((char[]) {field[0], field[1], '\0'}, NULL, 10);
@ -204,7 +204,7 @@ bool minmea_scan(const char *sentence, const char *format, ...)
int h = -1, i = -1, s = -1, u = -1; int h = -1, i = -1, s = -1, u = -1;
// Minimum required: integer time. // Minimum required: integer time.
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
if (!isdigit(field[i])) if (!isdigit((unsigned char) field[i]))
goto end_T; goto end_T;
h = strtol((char[]) {field[0], field[1], '\0'}, NULL, 10); h = strtol((char[]) {field[0], field[1], '\0'}, NULL, 10);
@ -216,7 +216,7 @@ bool minmea_scan(const char *sentence, const char *format, ...)
if (*field++ == '.') { if (*field++ == '.') {
int value = 0; int value = 0;
int scale = 1000000; int scale = 1000000;
while (isdigit(*field) && scale > 1) { while (isdigit((unsigned char) *field) && scale > 1) {
value = (value * 10) + (*field++ - '0'); value = (value * 10) + (*field++ - '0');
scale /= 10; scale /= 10;
} }