From 7928f72f8d269ac405db4753f6a7d8de844bc0cd Mon Sep 17 00:00:00 2001 From: cyanpencil Date: Tue, 26 Jun 2018 13:34:49 +0200 Subject: [PATCH] change cases flag format --- libr/anal/fcn.c | 4 ++-- libr/core/disasm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libr/anal/fcn.c b/libr/anal/fcn.c index 3b84a18463d42..a9b4782811874 100644 --- a/libr/anal/fcn.c +++ b/libr/anal/fcn.c @@ -442,8 +442,8 @@ static void queue_case(RAnal *anal, ut64 switch_addr, ut64 case_addr, ut64 id, u // "CCu case %d: @ 0x%"PFMT64x "\n", // id, case_addr); anal->cmdtail = r_str_appendf (anal->cmdtail, - "f case.%d.0x%"PFMT64x " 1 @ 0x%08"PFMT64x "\n", - id, switch_addr, case_addr); + "f case.0x%"PFMT64x ".%d 1 @ 0x%08"PFMT64x "\n", + switch_addr, id, case_addr); } static int try_walkthrough_jmptbl(RAnal *anal, RAnalFunction *fcn, int depth, ut64 ip, ut64 jmptbl_loc, ut64 jmptbl_off, ut64 sz, ut64 jmptbl_size, ut64 default_case, int ret0) { diff --git a/libr/core/disasm.c b/libr/core/disasm.c index 72bb1426a2ae3..dc88ac9b7b100 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -1860,7 +1860,7 @@ static void ds_show_flags(RDisasmState *ds) { continue; } if (!strncmp (flag->name, "case.", 5)) { - sscanf (flag->name + 5, "%d.%63s", &case_current, addr); + sscanf (flag->name + 5, "%63[^.].%d", addr, &case_current); ut64 saddr = r_num_math (core->num, addr); if (case_start == -1) { switch_addr = saddr;