From bfdde3f565a8a687bc8ebd582d6dee30ea76c8a8 Mon Sep 17 00:00:00 2001 From: pancake Date: Wed, 9 Mar 2016 09:50:30 +0100 Subject: [PATCH] Remove flag listing issues with asm.functions=false --- libr/core/disasm.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libr/core/disasm.c b/libr/core/disasm.c index ddad62dafa..dd228b93a0 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -1088,9 +1088,7 @@ static void handle_show_flags_option(RCore *core, RDisasmState *ds) { handle_print_offset (core, ds); r_cons_printf (" "); } else { - if (ds->show_functions) { - r_cons_printf ((f && ds->at > f->addr)?"| ": " "); - } + r_cons_printf ((f && ds->at > f->addr)?"| ": " "); handle_print_lines_left (core, ds); r_cons_printf (";-- "); } @@ -1100,21 +1098,13 @@ static void handle_show_flags_option(RCore *core, RDisasmState *ds) { if (ds->asm_demangle) { const char *lang = r_config_get (core->config, "bin.lang"); char *name = r_bin_demangle (core->bin->cur, lang, flag->realname); - if (!name) - name = strdup (flag->realname); - if (ds->show_functions) - r_cons_printf ("%s:\n", name); - else r_cons_printf ("%s%s", beginch, name); + r_cons_printf ("%s:\n", name? name: flag->realname); R_FREE (name); } else { - if (ds->show_functions) { - r_cons_printf ("%s:\n", flag->name); - } else r_cons_printf ("%s%s", beginch, flag->name); + r_cons_printf ("%s:\n", flag->name); } printed = true; } - if (printed && !ds->show_functions) - r_cons_printf (":\n"); } static void handle_update_ref_lines (RCore *core, RDisasmState *ds) {