d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic nit:

Browse Source 
- rename isspace1() macro to the more appropriate rtld_isspace().

Discussed with:	kib
This commit is contained in:
Sergey Kandaurov 2012-03-06 09:34:30 +00:00
parent 40b39918be
commit 44976acae3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232590
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libexec/rtld-elf/libmap.c
View File

@ -56,7 +56,7 @@ static int closestrfn (void * cookie);
* Do not use ctype.h macros, which rely on working TLS. It is
* too early to have thread-local variables functional.
*/
#define isspace1(c) ((c) == ' ' || (c) == '\t')
#define rtld_isspace(c) ((c) == ' ' || (c) == '\t')
int
lm_init (char *libmap_override)
@ -112,7 +112,7 @@ lmc_parse (FILE *fp)
t = f = c = NULL;
/* Skip over leading space */
while (isspace1(*cp)) cp++;
while (rtld_isspace(*cp)) cp++;
/* Found a comment or EOL */
if (iseol(*cp)) continue;
@ -122,7 +122,7 @@ lmc_parse (FILE *fp)
cp++;
/* Skip leading space */
while (isspace1(*cp)) cp++;
while (rtld_isspace(*cp)) cp++;
/* Found comment, EOL or end of selector */
if (iseol(*cp) || *cp == ']')
@ -130,11 +130,11 @@ lmc_parse (FILE *fp)
c = cp++;
/* Skip to end of word */
while (!isspace1(*cp) && !iseol(*cp) && *cp != ']')
while (!rtld_isspace(*cp) && !iseol(*cp) && *cp != ']')
cp++;
/* Skip and zero out trailing space */
while (isspace1(*cp)) *cp++ = '\0';
while (rtld_isspace(*cp)) *cp++ = '\0';
/* Check if there is a closing brace */
if (*cp != ']') continue;
@ -146,7 +146,7 @@ lmc_parse (FILE *fp)
* There should be nothing except whitespace or comment
from this point to the end of the line.
*/
while(isspace1(*cp)) cp++;
while(rtld_isspace(*cp)) cp++;
if (!iseol(*cp)) continue;
strcpy(prog, c);
@ -156,20 +156,20 @@ lmc_parse (FILE *fp)
/* Parse the 'from' candidate. */
f = cp++;
while (!isspace1(*cp) && !iseol(*cp)) cp++;
while (!rtld_isspace(*cp) && !iseol(*cp)) cp++;
/* Skip and zero out the trailing whitespace */
while (isspace1(*cp)) *cp++ = '\0';
while (rtld_isspace(*cp)) *cp++ = '\0';
/* Found a comment or EOL */
if (iseol(*cp)) continue;
/* Parse 'to' mapping */
t = cp++;
while (!isspace1(*cp) && !iseol(*cp)) cp++;
while (!rtld_isspace(*cp) && !iseol(*cp)) cp++;
/* Skip and zero out the trailing whitespace */
while (isspace1(*cp)) *cp++ = '\0';
while (rtld_isspace(*cp)) *cp++ = '\0';
/* Should be no extra tokens at this point */
if (!iseol(*cp)) continue;