Make setenv() return status

Currently, the setenv function does not return an error code.
This patch allows to test for errors.

Signed-off-by: Steve Falco <sfalco@harris.com>

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 49f134a92e51eb797be0eada8429870905fe59e0..b102ae3629e4929fb342e55fa318401b1e0762e0 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -380,13 +380,13 @@ int _do_setenv (int flag, int argc, char *argv[])
        return 0;
 }
 
-void setenv (char *varname, char *varvalue)
+int setenv (char *varname, char *varvalue)
 {
        char *argv[4] = { "setenv", varname, varvalue, NULL };
        if (varvalue == NULL)
-               _do_setenv (0, 2, argv);
+               return _do_setenv (0, 2, argv);
        else
-               _do_setenv (0, 3, argv);
+               return _do_setenv (0, 3, argv);
 }
 
 #ifdef CONFIG_HAS_UID

diff --git a/include/asm-arm/u-boot-arm.h b/include/asm-arm/u-boot-arm.h
index 41e7a8f7d3f9640063548376345d794d51a5d4e3..4ee5a327e5f594da73c28d4ccbea8718513141c0 100644 (file)
--- a/include/asm-arm/u-boot-arm.h
+++ b/include/asm-arm/u-boot-arm.h
@@ -52,7 +52,7 @@ void  setup_revision_tag (struct tag **params);
 /* To be fixed!                                                        */
 /* ------------------------------------------------------------ */
 /* common/cmd_nvedit.c */
-void   setenv          (char *, char *);
+int    setenv          (char *, char *);
 
 /* cpu/.../interrupt.c */
 void   reset_timer_masked      (void);

diff --git a/include/common.h b/include/common.h
index 319078178bfa9c64a054e2c394a1d7eba462f0cd..10b997e9ec6189cb79e660cf1664ebdd7f2e345f 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -243,9 +243,9 @@ char        *getenv      (char *);
 int    getenv_r     (char *name, char *buf, unsigned len);
 int    saveenv      (void);
 #ifdef CONFIG_PPC              /* ARM version to be fixed! */
-void inline setenv   (char *, char *);
+int inline setenv   (char *, char *);
 #else
-void   setenv       (char *, char *);
+int    setenv       (char *, char *);
 #ifdef CONFIG_HAS_UID
 void   forceenv     (char *, char *);
 #endif

diff --git a/include/exports.h b/include/exports.h
index d6512cb3a45a1ed738ad9768d7a909469cb736cf..6377875bc9a9a151f8b182a32c32c0b1458fd7a7 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -22,7 +22,7 @@ void vprintf(const char *, va_list);
 void do_reset (void);
 unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base);
 char *getenv (char *name);
-void setenv (char *varname, char *varvalue);
+int setenv (char *varname, char *varvalue);
 long simple_strtol(const char *cp,char **endp,unsigned int base);
 int strcmp(const char * cs,const char * ct);
 #ifdef CONFIG_HAS_UID