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

Remove redundant strlen checks, do not check the same

Browse Source 
symbol twice.
This commit is contained in:
Alexander Kabaev 2003-04-30 19:05:53 +00:00
parent d95bef1cef
commit 486089f00c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=114316
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ lm_init (void)
while (isspace(*cp)) cp++;
/* Found a comment or EOL */
if (iseol(*cp)) goto next;
if (iseol(*cp)) continue;
/* Found a constraint selector */
if (*cp == '[') {
@ -69,17 +69,19 @@ lm_init (void)
while (isspace(*cp)) cp++;
/* Found comment, EOL or end of selector */
if (iseol(*cp) || *cp == ']') goto next;
if (iseol(*cp) || *cp == ']')
continue;
p = cp;
p = cp++;
/* Skip to end of word */
while (!isspace(*cp) && !iseol(*cp) && *cp != ']') cp++;
while (!isspace(*cp) && !iseol(*cp) && *cp != ']')
cp++;
/* Skip and zero out trailing space */
while (isspace(*cp)) *cp++ = '\0';
/* Check if there is a closing brace */
if (*cp != ']') goto next;
if (*cp != ']') continue;
/* Terminate string if there was no trailing space */
*cp++ = '\0';
@ -89,38 +91,37 @@ lm_init (void)
* from this point to the end of the line.
*/
while(isspace(*cp++));
if (*cp != '\0' && *cp != '#') goto next;
if (!iseol(*cp)) continue;
if (strlen(p) > 0) {
bzero(prog, MAXPATHLEN);
strncpy(prog, p, strlen(p));
p = prog;
}
goto next;
strcpy(prog, p);
p = prog;
continue;
}
/* Parse the 'from' candidate. */
f = cp;
f = cp++;
while (!isspace(*cp) && !iseol(*cp)) cp++;
*cp++ = '\0';
/* Skip and zero out the trailing whitespace */
while (isspace(*cp)) *cp++ = '\0';
/* Found a comment or EOL */
if (iseol(*cp)) goto next;
if (iseol(*cp)) continue;
/* Parse 'to' mapping */
t = cp;
t = cp++;
while (!isspace(*cp) && !iseol(*cp)) cp++;
*cp++ = '\0';
/* Skip and zero out the trailing whitespace */
while (isspace(*cp)) *cp++ = '\0';
if ((strlen(f) > 0) && (strlen(t) > 0))
lm_add(p, strdup(f), strdup(t));
next:
bzero(line, sizeof(line));
/* Should be no extra tokens at this point */
if (!iseol(*cp)) continue;
*cp = '\0';
lm_add(p, strdup(f), strdup(t));
}
(void)fclose(fp);
fclose(fp);
return;
}