From 910c84225cf2a640bc36cbcbbd3de7744891c2c5 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 14 Aug 2021 14:49:48 -0700 Subject: [PATCH] replace sfio SF_MAXCHAR with libc UCHAR_MAX Related to #1998. --- lib/sfio/sfhdr.h | 8 +++----- lib/sfio/sftable.c | 3 ++- lib/sfio/sfvscanf.c | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h index 863bb9dde..6c69ae45e 100644 --- a/lib/sfio/sfhdr.h +++ b/lib/sfio/sfhdr.h @@ -480,8 +480,6 @@ extern "C" { #define SF_MAXINT ((int)(((uint)~0) >> 1)) #define SF_MAXLONG ((long)(((ulong)~0L) >> 1)) -#define SF_MAXCHAR ((uchar)(~0)) - /* floating point to ascii conversion */ #define SF_MAXEXP10 6 #define SF_MAXPOW10 (1 << SF_MAXEXP10) @@ -510,9 +508,9 @@ extern "C" { int sf_cvinit; /* initialization state */ Fmtpos_t *(*sf_fmtposf) (Sfio_t *, const char *, va_list, int); char *(*sf_fmtintf) (const char *, int *); - uchar sf_cv36[SF_MAXCHAR + 1]; /* conversion for base [2-36] */ - uchar sf_cv64[SF_MAXCHAR + 1]; /* conversion for base [37-64] */ - uchar sf_type[SF_MAXCHAR + 1]; /* conversion formats&types */ + uchar sf_cv36[UCHAR_MAX + 1]; /* conversion for base [2-36] */ + uchar sf_cv64[UCHAR_MAX + 1]; /* conversion for base [37-64] */ + uchar sf_type[UCHAR_MAX + 1]; /* conversion formats&types */ } Sftab_t; /* thread-safe macro/function to initialize _Sfcv* conversion tables */ diff --git a/lib/sfio/sftable.c b/lib/sfio/sftable.c index ade2390e1..c1800005f 100644 --- a/lib/sfio/sftable.c +++ b/lib/sfio/sftable.c @@ -8,6 +8,7 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ +#include #include #include @@ -384,7 +385,7 @@ static int sfcvinit(void) { int d, l; - for (d = 0; d <= SF_MAXCHAR; ++d) { + for (d = 0; d <= UCHAR_MAX; ++d) { _Sfcv36[d] = SF_RADIX; _Sfcv64[d] = SF_RADIX; } diff --git a/lib/sfio/sfvscanf.c b/lib/sfio/sfvscanf.c index 2e9c1b1c4..39ac193c2 100644 --- a/lib/sfio/sfvscanf.c +++ b/lib/sfio/sfvscanf.c @@ -9,6 +9,7 @@ *************************************************************************/ #include +#include #include #include @@ -33,7 +34,7 @@ static char *setclass(char *form, char *accept) } else yes = 1; - for (c = 0; c <= SF_MAXCHAR; ++c) + for (c = 0; c <= UCHAR_MAX; ++c) accept[c] = !yes; if (fmt == ']' || fmt == '-') { /* special first char */ -- 2.49.0