From 5f7eb1ff5481157ff39edbbac81c60f7dd7e4542 Mon Sep 17 00:00:00 2001 From: Neel Natu Date: Wed, 11 Aug 2010 02:13:50 +0000 Subject: Start using the 'init_static_kenv()' API provided by r198561 to initialize CFE environment variables. --- sys/dev/cfe/cfe_env.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'sys/dev/cfe') diff --git a/sys/dev/cfe/cfe_env.c b/sys/dev/cfe/cfe_env.c index a72e46e141a8..c47086be6142 100644 --- a/sys/dev/cfe/cfe_env.c +++ b/sys/dev/cfe/cfe_env.c @@ -25,8 +25,7 @@ */ #include -#include -#include +#include #include @@ -43,32 +42,20 @@ static char cfe_env_buf[CFE_ENV_SIZE]; void cfe_env_init(void) { - int idx, len; - char name[64], val[128], *cp, *cplim; + int idx; + char name[KENV_MNAMELEN], val[KENV_MVALLEN]; - cp = cfe_env_buf; - cplim = cp + CFE_ENV_SIZE; + init_static_kenv(cfe_env_buf, CFE_ENV_SIZE); idx = 0; while (1) { if (cfe_enumenv(idx, name, sizeof(name), val, sizeof(val)) != 0) break; - if (bootverbose) - printf("Importing CFE env: \"%s=%s\"\n", name, val); - - /* - * name=val\0\0 - */ - len = strlen(name) + 1 + strlen(val) + 1 + 1; - if (cplim - cp < len) + if (setenv(name, val) != 0) { printf("No space to store CFE env: \"%s=%s\"\n", name, val); - else - cp += sprintf(cp, "%s=%s", name, val) + 1; + } ++idx; } - *cp++ = '\0'; - - kern_envp = cfe_env_buf; } -- cgit v1.3