env: Rename setenv() to env_set()
We are now using an env_ prefix for environment functions. Rename setenv() for consistency. Also add function comments in common.h. Suggested-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
EXPORT_FUNC(do_reset, int, do_reset, cmd_tbl_t *,
|
||||
int , int , char * const [])
|
||||
EXPORT_FUNC(getenv, char *, getenv, const char*)
|
||||
EXPORT_FUNC(setenv, int, setenv, const char *, const char *)
|
||||
EXPORT_FUNC(env_set, int, env_set, const char *, const char *)
|
||||
EXPORT_FUNC(simple_strtoul, unsigned long, simple_strtoul,
|
||||
const char *, char **, unsigned int)
|
||||
EXPORT_FUNC(strict_strtoul, int, strict_strtoul,
|
||||
|
||||
@@ -336,7 +336,19 @@ ulong getenv_hex(const char *varname, ulong default_val);
|
||||
* Return -1 if variable does not exist (default to true)
|
||||
*/
|
||||
int getenv_yesno(const char *var);
|
||||
int setenv (const char *, const char *);
|
||||
|
||||
/**
|
||||
* env_set() - set an environment variable
|
||||
*
|
||||
* This sets or deletes the value of an environment variable. For setting the
|
||||
* value the variable is created if it does not already exist.
|
||||
*
|
||||
* @varname: Variable to adjust
|
||||
* @value: Value to set for the variable, or NULL or "" to delete the variable
|
||||
* @return 0 if OK, 1 on error
|
||||
*/
|
||||
int env_set(const char *varname, const char *value);
|
||||
|
||||
int setenv_ulong(const char *varname, ulong value);
|
||||
int setenv_hex(const char *varname, ulong value);
|
||||
/**
|
||||
|
||||
@@ -334,7 +334,7 @@ do { \
|
||||
else \
|
||||
strcpy(ethname, "ethaddr"); \
|
||||
printf("Setting %s from EEPROM with %s\n", ethname, buf);\
|
||||
setenv(ethname, buf); \
|
||||
env_set(ethname, buf); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@ extern int AT91F_DataflashInit(void);
|
||||
|
||||
extern void dataflash_print_info (void);
|
||||
extern void dataflash_perror (int err);
|
||||
extern void AT91F_DataflashSetEnv (void);
|
||||
extern void AT91F_Dataflashenv_set(void);
|
||||
|
||||
extern struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS];
|
||||
extern dataflash_protect_t area_list[NB_DATAFLASH_AREA];
|
||||
|
||||
@@ -28,7 +28,7 @@ int vprintf(const char *, va_list);
|
||||
unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base);
|
||||
int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
|
||||
char *getenv (const char *name);
|
||||
int setenv (const char *varname, const char *varvalue);
|
||||
int env_set(const char *varname, const char *value);
|
||||
long simple_strtol(const char *cp, char **endp, unsigned int base);
|
||||
int strcmp(const char *cs, const char *ct);
|
||||
unsigned long ustrtoul(const char *cp, char **endp, unsigned int base);
|
||||
|
||||
@@ -118,7 +118,7 @@ extern int hwalk_r(struct hsearch_data *__htab, int (*callback)(ENTRY *));
|
||||
#define H_MATCH_SUBSTR (1 << 7) /* search for substring matches */
|
||||
#define H_MATCH_REGEX (1 << 8) /* search for regular expression matches */
|
||||
#define H_MATCH_METHOD (H_MATCH_IDENT | H_MATCH_SUBSTR | H_MATCH_REGEX)
|
||||
#define H_PROGRAMMATIC (1 << 9) /* indicate that an import is from setenv() */
|
||||
#define H_PROGRAMMATIC (1 << 9) /* indicate that an import is from env_set() */
|
||||
#define H_ORIGIN_FLAGS (H_INTERACTIVE | H_PROGRAMMATIC)
|
||||
|
||||
#endif /* _SEARCH_H_ */
|
||||
|
||||
Reference in New Issue
Block a user