From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 28 Jan 2014 01:48:48 +0000 (+0800)
Subject: discover/grub2: Use script_env_set when initialising the environment
X-Git-Tag: v1.0.0~257
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=d6b11766acb4457457419a84f460a3ce7a8f4693;hp=e61e64c785de0809fb69cd160e8317f2de25793e;ds=sidebyside

discover/grub2: Use script_env_set when initialising the environment

No need to duplicate the environment-adding code in init_env, as we can
just use script_env_set.

Since script_env_set does its own talloc, we don't need to talloc our
strings here either.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index aeb5978..c4f58d9 100644
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -432,13 +432,9 @@ static void init_env(struct grub2_script *script)
 					sep - script->filename);
 	}
 
-	env->name = talloc_strdup(env, "prefix");
+	script_env_set(script, "prefix", prefix ? : default_prefix);
 	if (prefix)
-		env->value = prefix;
-	else
-		env->value = talloc_strdup(env, default_prefix);
-
-	list_add(&script->environment, &env->list);
+		talloc_free(prefix);
 }
 
 void script_register_function(struct grub2_script *script,