diff options
| -rw-r--r-- | src/driver/slbt_symlist_ctx.c | 13 | ||||
| -rw-r--r-- | src/internal/slibtool_lconf_impl.c | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/driver/slbt_symlist_ctx.c b/src/driver/slbt_symlist_ctx.c index 2a4997d..09bde7a 100644 --- a/src/driver/slbt_symlist_ctx.c +++ b/src/driver/slbt_symlist_ctx.c @@ -52,6 +52,7 @@ int slbt_lib_get_symlist_ctx( char * src; const char ** psym; char dummy; + int cint; bool fvalid; /* map symlist file temporarily */ @@ -68,16 +69,16 @@ int slbt_lib_get_symlist_ctx( src = mapinfo.size ? mapinfo.addr : &dummy; cap = &src[mapinfo.size]; - for (; (src<cap) && isspace(*src); ) + for (; (src<cap) && isspace((cint=*src)); ) src++; for (ch=src,nsyms=0; ch<cap; nsyms++) { - for (; (ch<cap) && !isspace(*ch); ) + for (; (ch<cap) && !isspace((cint=*ch)); ) ch++; fvalid = false; - for (; (ch<cap) && isspace(*ch); ) + for (; (ch<cap) && isspace((cint=*ch)); ) fvalid = (*ch++ == '\n') || fvalid; if (!fvalid) @@ -112,16 +113,16 @@ int slbt_lib_get_symlist_ctx( src = ctx->symstrs; cap = &src[mapinfo.size]; - for (; (src<cap) && isspace(*src); ) + for (; (src<cap) && isspace((cint=*src)); ) src++; for (ch=src,psym=ctx->symstrv; ch<cap; psym++) { *psym = ch; - for (; (ch<cap) && !isspace(*ch); ) + for (; (ch<cap) && !isspace((cint=*ch)); ) ch++; - for (; (ch<cap) && isspace(*ch); ) + for (; (ch<cap) && isspace((cint=*ch)); ) *ch++ = '\0'; } diff --git a/src/internal/slibtool_lconf_impl.c b/src/internal/slibtool_lconf_impl.c index 298cb12..9addd0a 100644 --- a/src/internal/slibtool_lconf_impl.c +++ b/src/internal/slibtool_lconf_impl.c @@ -629,6 +629,7 @@ static int slbt_get_lconf_var( const char * mark; const char * match; ssize_t len; + int cint; /* init */ len = strlen(var); @@ -649,7 +650,7 @@ static int slbt_get_lconf_var( while ((*mark != '\n') && (mark < cap)) mark++; - while (isspace(*mark) && (mark < cap)) + while (isspace((cint=*mark)) && (mark < cap)) mark++; } } @@ -669,7 +670,7 @@ static int slbt_get_lconf_var( for (; (*mark != '"') && (mark < cap); ) mark++; } else { - for (; !isspace(*mark) && (mark < cap); ) + for (; !isspace((cint=*mark)) && (mark < cap); ) mark++; } |