diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:24:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:24:56 +0200 |
| commit | df1dcc057e174925b61ac16e254cd074bb8d013a (patch) | |
| tree | 369ce088c557f86834ae4b3d7f03427f55235fa0 /common | |
| parent | b341486527206a8f14edfe1f9c04b6aecb5a8601 (diff) | |
| parent | 9bdc30075f6854e00934dd52a4ea93043ff737fd (diff) | |
| download | barebox-df1dcc057e174925b61ac16e254cd074bb8d013a.tar.gz barebox-df1dcc057e174925b61ac16e254cd074bb8d013a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/globalvar.c | 4 | ||||
| -rw-r--r-- | common/hush.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/globalvar.c b/common/globalvar.c index a8aaa72553..abcd881adf 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -22,7 +22,7 @@ int globalvar_add(const char *name, * get a concatenated string of all globalvars beginning with 'match'. * This adds whitespaces between the different globalvars */ -char *globalvar_get_match(const char *match, const char *seperator) +char *globalvar_get_match(const char *match, const char *separator) { char *val = NULL; struct param_d *param; @@ -31,7 +31,7 @@ char *globalvar_get_match(const char *match, const char *seperator) if (!strncmp(match, param->name, strlen(match))) { const char *p = dev_get_param(&global_device, param->name); if (val) { - char *new = asprintf("%s%s%s", val, seperator, p); + char *new = asprintf("%s%s%s", val, separator, p); free(val); val = new; } else { diff --git a/common/hush.c b/common/hush.c index b5e111a019..a3235ba19f 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1959,7 +1959,7 @@ BAREBOX_CMD_START(getopt) BAREBOX_CMD_END #endif -BAREBOX_MAGICVAR(PATH, "colon seperated list of pathes to search for executables"); +BAREBOX_MAGICVAR(PATH, "colon separated list of pathes to search for executables"); #ifdef CONFIG_HUSH_FANCY_PROMPT BAREBOX_MAGICVAR(PS1, "hush prompt"); #endif |