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>

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>
Steven A. Falco · Wolfgang Denk
1 parent 4928e97c85
Showing 4 changed files with 7 additions and 7 deletions Side-by-side Diff
common/cmd_nvedit.c
include/asm-arm/u-boot-arm.h
include/common.h
include/exports.h
@@ -380,13 +380,13 @@
 	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
@@ -52,7 +52,7 @@
 /* To be fixed!							*/
 /* ------------------------------------------------------------ */
 /* common/cmd_nvedit.c */
-void	setenv		(char *, char *);
+int	setenv		(char *, char *);
  
 /* cpu/.../interrupt.c */
 void	reset_timer_masked	(void);
@@ -243,9 +243,9 @@
 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
@@ -22,7 +22,7 @@
 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
...	...	@@ -380,13 +380,13 @@
380	380	return 0;
381	381	}
382	382
383		-void setenv (char varname, char varvalue)
	383	+int setenv (char varname, char varvalue)
384	384	{
385	385	char *argv[4] = { "setenv", varname, varvalue, NULL };
386	386	if (varvalue == NULL)
387		- _do_setenv (0, 2, argv);
	387	+ return _do_setenv (0, 2, argv);
388	388	else
389		- _do_setenv (0, 3, argv);
	389	+ return _do_setenv (0, 3, argv);
390	390	}
391	391
392	392	#ifdef CONFIG_HAS_UID
...	...	@@ -52,7 +52,7 @@
52	52	/* To be fixed! */
53	53	/* ------------------------------------------------------------ */
54	54	/* common/cmd_nvedit.c */
55		-void setenv (char , char );
	55	+int setenv (char , char );
56	56
57	57	/* cpu/.../interrupt.c */
58	58	void reset_timer_masked (void);
...	...	@@ -243,9 +243,9 @@
243	243	int getenv_r (char name, char buf, unsigned len);
244	244	int saveenv (void);
245	245	#ifdef CONFIG_PPC /* ARM version to be fixed! */
246		-void inline setenv (char , char );
	246	+int inline setenv (char , char );
247	247	#else
248		-void setenv (char , char );
	248	+int setenv (char , char );
249	249	#ifdef CONFIG_HAS_UID
250	250	void forceenv (char , char );
251	251	#endif
...	...	@@ -22,7 +22,7 @@
22	22	void do_reset (void);
23	23	unsigned long simple_strtoul(const char cp,char *endp,unsigned int base);
24	24	char getenv (char name);
25		-void setenv (char varname, char varvalue);
	25	+int setenv (char varname, char varvalue);
26	26	long simple_strtol(const char cp,char *endp,unsigned int base);
27	27	int strcmp(const char * cs,const char * ct);
28	28	#ifdef CONFIG_HAS_UID