diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:00:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:00:03 +0100 |
| commit | e05529dd8b582c4421938066a5ff5006452ced78 (patch) | |
| tree | b4e925b08f2f672c6331db06c4b1986e58f89a75 /common | |
| parent | 0c3f4d1da2277ac0cb88dc32ac0de48bc241e01f (diff) | |
| parent | 9563a024d28c0f35db8fc459931f4909bbffe5eb (diff) | |
| download | barebox-e05529dd8b582c4421938066a5ff5006452ced78.tar.gz barebox-e05529dd8b582c4421938066a5ff5006452ced78.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/boot.c | 2 | ||||
| -rw-r--r-- | common/environment.c | 2 | ||||
| -rw-r--r-- | common/globalvar.c | 4 | ||||
| -rw-r--r-- | common/menu.c | 12 |
4 files changed, 9 insertions, 11 deletions
diff --git a/common/boot.c b/common/boot.c index 123b874b3c..4306319331 100644 --- a/common/boot.c +++ b/common/boot.c @@ -44,7 +44,7 @@ struct bootentries *bootentries_alloc(void) if (IS_ENABLED(CONFIG_MENU)) { bootentries->menu = menu_alloc(); - menu_add_title(bootentries->menu, basprintf("boot")); + menu_add_title(bootentries->menu, "boot"); } return bootentries; diff --git a/common/environment.c b/common/environment.c index c9cef6322a..0edf34b661 100644 --- a/common/environment.c +++ b/common/environment.c @@ -382,7 +382,7 @@ EXPORT_SYMBOL(envfs_save); static int envfs_check_super(struct envfs_super *super, size_t *size) { if (ENVFS_32(super->magic) != ENVFS_MAGIC) { - printf("envfs: no envfs (magic mismatch) - envfs newer written?\n"); + printf("envfs: no envfs (magic mismatch) - envfs never written?\n"); return -EIO; } diff --git a/common/globalvar.c b/common/globalvar.c index e75cac96d7..52808f8852 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -379,10 +379,10 @@ void globalvar_set_match(const char *match, const char *val) } } -int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val) +static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val) { struct device_d *rdev; - const char *pname; + const char *pname = NULL; int ret; ret = nvvar_device_dispatch(p->name, &rdev, &pname); diff --git a/common/menu.c b/common/menu.c index 64df458e68..e757216c5a 100644 --- a/common/menu.c +++ b/common/menu.c @@ -526,18 +526,17 @@ EXPORT_SYMBOL(menu_add_command_entry); * @display: NULL or pointer to the string which will be freed in this function. * If NULL or zero length string is provided, default title will be added. */ -void menu_add_title(struct menu *m, char *display) +void menu_add_title(struct menu *m, const char *display) { char *tmp, *src, *dst; int lines = 1; int i; - if (!display || !strlen(display)) { - free(display); - display = xasprintf("Menu : %s", m->name ? m->name : ""); - } + if (!display || !strlen(display)) + src = dst = tmp = xasprintf("Menu : %s", m->name ? m->name : ""); + else + src = dst = tmp = xstrdup(display); - src = dst = tmp = xstrdup(display); /* Count lines and separate single string into multiple strings */ while (*src) { if (*src == '\\') { @@ -575,6 +574,5 @@ void menu_add_title(struct menu *m, char *display) } free(tmp); - free(display); } EXPORT_SYMBOL(menu_add_title); |