michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib: os: prf: correct use of istype functions

Browse source 
Character class functions from ctype.h may be implemented as macros
where the argument is used to index an array of class flags.  Using a
char value as an index produces diagnostics in some toolchains.
Explicitly cast the parameter to the type required by the API.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-08-18 14:10:38 -05:00 • committed by Carles Cufí
commit b3f0c3b4d7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/os/prf.c
View file

@ -234,7 +234,7 @@ static int _to_float(char *buf, uint64_t double_temp, char c,
if (exp == 0x7ff) {
if (!fract) {
if (isupper(c)) {
if (isupper((int)c)) {
*buf++ = 'I';
*buf++ = 'N';
*buf++ = 'F';
@ -244,7 +244,7 @@ static int _to_float(char *buf, uint64_t double_temp, char c,
*buf++ = 'f';
}
} else {
if (isupper(c)) {
if (isupper((int)c)) {
*buf++ = 'N';
*buf++ = 'A';
*buf++ = 'N';
@ -426,7 +426,7 @@ static int _atoi(const char **sptr)
const char *p = *sptr - 1;
int i = 0;
while (isdigit(*p)) {
while (isdigit((int)*p)) {
i = 10 * i + *p++ - '0';
}
*sptr = p;
@ -499,7 +499,7 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
width = -width;
}
c = *format++;
} else if (!isdigit(c)) {
} else if (!isdigit((int)c)) {
width = 0;
} else {
width = _atoi(&format); /* Find width */
@ -603,7 +603,7 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
prefix = 1;
}
clen += zero.predot + zero.postdot + zero.trail;
if (!isdigit(buf[prefix])) {
if (!isdigit((int)buf[prefix])) {
/* inf or nan: no zero padding */
fzero = false;
}
@ -752,7 +752,7 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
count += clen;
if (zero.predot) {
c = *cptr;
while (isdigit(c)) {
while (isdigit((int)c)) {
PUTC(c);
clen--;
c = *++cptr;
@ -775,7 +775,7 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
}
if (zero.trail) {
c = *cptr;
while (isdigit(c) || c == '.') {
while (isdigit((int)c) || c == '.') {
PUTC(c);
clen--;
c = *++cptr;