diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-15 20:08:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-15 20:08:38 +0800 |
| commit | b674d6ecd467c91c826536240ee6863d13ff83c0 (patch) | |
| tree | 0a21a2760c87648fcff6598ab7b4d7d1c49f536e /scripts | |
| parent | b9588c1372b57a22c0509c5bbe0bea3b9734021b (diff) | |
| parent | d266af7f712dc494727b6a18e26fb123911884d5 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/menu.c | 6 | ||||
| -rw-r--r-- | scripts/sortextable.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index fd3f0180e08f..d908e5496532 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -525,7 +525,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, { int i, j; struct menu *submenu[8], *menu, *location = NULL; - struct jump_key *jump; + struct jump_key *jump = NULL; str_printf(r, _("Prompt: %s\n"), _(prop->text)); menu = prop->menu->parent; @@ -563,8 +563,8 @@ static void get_prompt_str(struct gstr *r, struct property *prop, str_printf(r, _(" Location:\n")); for (j = 4; --i >= 0; j += 2) { menu = submenu[i]; - if (head && location && menu == location) - jump->offset = r->len - 1; + if (jump && menu == location) + jump->offset = strlen(r->s); str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu))); if (menu->sym) { diff --git a/scripts/sortextable.h b/scripts/sortextable.h index f5eb43d42926..3f064799a8c3 100644 --- a/scripts/sortextable.h +++ b/scripts/sortextable.h @@ -101,7 +101,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) Elf_Sym *sort_needed_sym; Elf_Shdr *sort_needed_sec; Elf_Rel *relocs = NULL; - int relocs_size; + int relocs_size = 0; uint32_t *sort_done_location; const char *secstrtab; const char *strtab; |