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

Optimize prev. commit for speed.

Browse Source 
1) Don't iterate the loop from the environment array beginning each time,
iterate it under the last place we deactivate instead.
2) Call __rebuild_environ() not on each iteration but once, only at the end
of whole loop (of course, only in case if something is changed).

MFC after:      1 week
This commit is contained in:
ache 2012-10-03 04:46:58 +00:00
parent d142b7417c
commit cbaa91b075
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc/stdlib/getenv.c
View File

@ -662,6 +662,7 @@ unsetenv(const char *name)
{ {
int envNdx; int envNdx;
size_t nameLen; size_t nameLen;
int newEnvActive;
/* Check for malformed name. */ /* Check for malformed name. */
if (name == NULL || (nameLen = __strleneq(name)) == 0) { if (name == NULL || (nameLen = __strleneq(name)) == 0) {
@ -674,15 +675,18 @@ unsetenv(const char *name)
return (-1); return (-1);
/* Deactivate specified variable. */ /* Deactivate specified variable. */
envNdx = envVarsTotal - 1;
/* Remove all occurrences. */ /* Remove all occurrences. */
envNdx = envVarsTotal - 1;
newEnvActive = envActive;
while (__findenv(name, nameLen, &envNdx, true) != NULL) { while (__findenv(name, nameLen, &envNdx, true) != NULL) {
envVars[envNdx].active = false; envVars[envNdx].active = false;
if (envVars[envNdx].putenv) if (envVars[envNdx].putenv)
__remove_putenv(envNdx); __remove_putenv(envNdx);
__rebuild_environ(envActive - 1); envNdx--;
envNdx = envVarsTotal - 1; newEnvActive--;
} }
if (newEnvActive != envActive)
__rebuild_environ(newEnvActive);
return (0); return (0);
} }