diff options
| author | Steven A. Falco <sfalco@harris.com> | 2008-06-12 13:22:12 -0400 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-01 23:03:14 +0200 |
| commit | 75678c807a6272ecc5541eb32898c93887f08400 (patch) | |
| tree | 6bfbb1388af69cc3ec8627d305f74a097fdeb24a | |
| parent | 4928e97c8531283ca9b368b7c29a8a12e726562a (diff) | |
| download | bootable_bootloader_goldelico_gta04-75678c807a6272ecc5541eb32898c93887f08400.zip bootable_bootloader_goldelico_gta04-75678c807a6272ecc5541eb32898c93887f08400.tar.gz bootable_bootloader_goldelico_gta04-75678c807a6272ecc5541eb32898c93887f08400.tar.bz2 | |
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>
| -rw-r--r-- | common/cmd_nvedit.c | 6 | ||||
| -rw-r--r-- | include/asm-arm/u-boot-arm.h | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/exports.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 49f134a..b102ae3 100644 --- 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 41e7a8f..4ee5a32 100644 --- 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 3190781..10b997e 100644 --- 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 d6512cb..6377875 100644 --- 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 |