aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@FreeBSD.org>2012-03-06 09:34:30 +0000
committerSergey Kandaurov <pluknet@FreeBSD.org>2012-03-06 09:34:30 +0000
commit44976acae3059980972cc2e8c2c6d747469223bb (patch)
treec5e23ec70779461420567bdef82bb34ceeda9ff9
parent40b39918be452cf794be5ff08fd68562332981cb (diff)
downloadsrc-44976acae3059980972cc2e8c2c6d747469223bb.tar.gz
src-44976acae3059980972cc2e8c2c6d747469223bb.zip
Cosmetic nit:
- rename isspace1() macro to the more appropriate rtld_isspace(). Discussed with: kib
Notes
Notes: svn path=/head/; revision=232590
-rw-r--r--libexec/rtld-elf/libmap.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c
index 9c671867fd5d..7f55c9d84f92 100644
--- a/libexec/rtld-elf/libmap.c
+++ b/libexec/rtld-elf/libmap.c
@@ -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;