diff options
author | Mitchell Horne <mhorne@FreeBSD.org> | 2020-09-21 15:44:23 +0000 |
---|---|---|
committer | Mitchell Horne <mhorne@FreeBSD.org> | 2020-09-21 15:44:23 +0000 |
commit | 624a7e1f4fa023a46397ec0378e09d9925e785d1 (patch) | |
tree | 4477ab2e13e82d529f58f96bcd6dc7d27e456cb0 | |
parent | e32d47f32d72137dbf11578e05daf62fb8bce380 (diff) | |
download | src-624a7e1f4fa023a46397ec0378e09d9925e785d1.tar.gz src-624a7e1f4fa023a46397ec0378e09d9925e785d1.zip |
Use getenv_is_true() in init_static_kenv()
A small example of how these functions can be used to simplify checks of
this nature.
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D26271
Notes
Notes:
svn path=/head/; revision=365947
-rw-r--r-- | sys/kern/kern_environment.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 37fb26a637a1..3c4efdf1aa2a 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -253,7 +253,6 @@ done: void init_static_kenv(char *buf, size_t len) { - char *eval; KASSERT(!dynamic_kenv, ("kenv: dynamic_kenv already initialized")); /* @@ -301,20 +300,17 @@ init_static_kenv(char *buf, size_t len) * if the static environment has disabled the loader environment. */ kern_envp = static_env; - eval = kern_getenv("loader_env.disabled"); - if (eval == NULL || strcmp(eval, "1") != 0) { + if (!getenv_is_true("loader_env.disabled")) { md_envp = buf; md_env_len = len; md_env_pos = 0; - eval = kern_getenv("static_env.disabled"); - if (eval != NULL && strcmp(eval, "1") == 0) { + if (getenv_is_true("static_env.disabled")) { kern_envp[0] = '\0'; kern_envp[1] = '\0'; } } - eval = kern_getenv("static_hints.disabled"); - if (eval != NULL && strcmp(eval, "1") == 0) { + if (getenv_is_true("static_hints.disabled")) { static_hints[0] = '\0'; static_hints[1] = '\0'; } |