diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/kern/kern_environment.c | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/kern/kern_environment.c')
| -rw-r--r-- | sys/kern/kern_environment.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 98f5fc6..70ba635 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -131,7 +131,7 @@ kenv(td, uap) return (error); } - name = malloc(KENV_MNAMELEN, M_TEMP, M_WAITOK); + name = malloc(KENV_MNAMELEN, M_TEMP, 0); error = copyinstr(uap->name, name, KENV_MNAMELEN, NULL); if (error) @@ -166,7 +166,7 @@ kenv(td, uap) } if (len > KENV_MVALLEN) len = KENV_MVALLEN; - value = malloc(len, M_TEMP, M_WAITOK); + value = malloc(len, M_TEMP, 0); error = copyinstr(uap->value, value, len, NULL); if (error) { free(value, M_TEMP); @@ -207,11 +207,11 @@ init_dynamic_kenv(void *data __unused) char *cp; int len, i; - kenvp = malloc(KENV_SIZE * sizeof(char *), M_KENV, M_WAITOK | M_ZERO); + kenvp = malloc(KENV_SIZE * sizeof(char *), M_KENV, M_ZERO); i = 0; for (cp = kern_envp; cp != NULL; cp = kernenv_next(cp)) { len = strlen(cp) + 1; - kenvp[i] = malloc(len, M_KENV, M_WAITOK); + kenvp[i] = malloc(len, M_KENV, 0); strcpy(kenvp[i++], cp); } kenvp[i] = NULL; @@ -290,7 +290,7 @@ getenv(const char *name) strcpy(buf, cp); sx_sunlock(&kenv_lock); len = strlen(buf) + 1; - ret = malloc(len, M_KENV, M_WAITOK); + ret = malloc(len, M_KENV, 0); strcpy(ret, buf); } else { sx_sunlock(&kenv_lock); @@ -337,7 +337,7 @@ setenv(const char *name, const char *value) vallen = strlen(value) + 1; if (vallen > KENV_MVALLEN) return (-1); - buf = malloc(namelen + vallen, M_KENV, M_WAITOK); + buf = malloc(namelen + vallen, M_KENV, 0); sprintf(buf, "%s=%s", name, value); sx_xlock(&kenv_lock); |
