mkimage: add "-V" option to print version information

[oweals/u-boot.git] / common / env_sf.c

diff --git a/common/env_sf.c b/common/env_sf.c
index a597b24dcb35213c00eabedc73481219015bffe8..41cc00aeabb141d83f37039af054136944a7ad6a 100644 (file)
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -92,7 +92,7 @@ int saveenv(void)
        }
 
        res = (char *)&env_new.data;
-       len = hexport('\0', &res, ENV_SIZE);
+       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE);
        if (len < 0) {
                error("Cannot export environment: errno = %d\n", errno);
                return 1;
@@ -272,7 +272,7 @@ int saveenv(void)
        u32 saved_size, saved_offset;
        char *saved_buffer = NULL;
        u32 sector = 1;
-       int ret;
+       int ret = 1;
        env_t   env_new;
        char    *res;
        ssize_t len;
@@ -293,7 +293,6 @@ int saveenv(void)
                saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
                saved_buffer = malloc(saved_size);
                if (!saved_buffer) {
-                       ret = 1;
                        goto done;
                }
                ret = spi_flash_read(env_flash, saved_offset,
@@ -309,7 +308,7 @@ int saveenv(void)
        }
 
        res = (char *)&env_new.data;
-       len = hexport('\0', &res, ENV_SIZE);
+       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE);
        if (len < 0) {
                error("Cannot export environment: errno = %d\n", errno);
                goto done;