summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-10-22 15:47:25 +0200
committerSimon Glass <sjg@chromium.org>2021-10-31 12:26:44 -0600
commit37f3758a250d4c590ffac671f100d9b5ec73b417 (patch)
treecca121da9f5283677ccfc3097b2711ddf298f463 /env
parentc5cbbe35fd7b3d05273f4d3f273c9e613bd38d7d (diff)
env: Use static_assert() to check if default_environment is too large
Check sizeof(default_environment) against ENV_SIZE in a static_assert() instead of runtime. Only check if !USE_HOSTCC (for in fw_env tool ENV_SIZE expands to a variable, and cannot be checked statically) nad !DEFAULT_ENV_INSTANCE_EMBEDDED, for in that case the default_environment variable is not set. Signed-off-by: Marek BehĂșn <marek.behun@nic.cz> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'env')
-rw-r--r--env/common.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/env/common.c b/env/common.c
index 664d2e688e..99729ca002 100644
--- a/env/common.c
+++ b/env/common.c
@@ -247,11 +247,6 @@ char *env_get_default(const char *name)
void env_set_default(const char *s, int flags)
{
- if (sizeof(default_environment) > ENV_SIZE) {
- puts("*** Error - default environment is too large\n\n");
- return;
- }
-
if (s) {
if ((flags & H_INTERACTIVE) == 0) {
printf("*** Warning - %s, "