diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2020-07-27 22:43:38 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2020-07-27 22:49:24 (GMT) |
| commit | d9c8eaac961b6fa097b362b2202c176a5ef16ec2 (patch) | |
| tree | ba4572719bd7b2f84d7e06e59fbacfcfddc4ddde /plugins/androhelpers | |
| parent | 703e0d10d56bb288b515526f0d0f1994391619bf (diff) | |
Replaced all BLC_* constants by the new DLC_* values.
Diffstat (limited to 'plugins/androhelpers')
| -rw-r--r-- | plugins/androhelpers/switch.c | 9 | ||||
| -rw-r--r-- | plugins/androhelpers/try_n_catch.c | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/plugins/androhelpers/switch.c b/plugins/androhelpers/switch.c index 605b4aa..39c8bc1 100644 --- a/plugins/androhelpers/switch.c +++ b/plugins/androhelpers/switch.c @@ -31,6 +31,7 @@ #include <arch/dalvik/instruction-def.h> #include <arch/operands/immediate.h> #include <format/dex/dex-int.h> +#include <gtkext/gtkblockdisplay.h> #include <../i18n.h> @@ -282,13 +283,13 @@ static void mark_all_switch_cases(const GArchInstruction *instr, const dex_switc value = dswitch->sparse.keys[index]; line = g_code_buffer_insert_at(buffer, (vmpa_t)targets[index], true); - g_buffer_line_start_merge_at(line, BLC_ASSEMBLY_HEAD); + g_buffer_line_start_merge_at(line, DLC_ASSEMBLY_HEAD); len = strlen(_("; Case for value 0x%08x (%d)")) + 8 + strlen("4294967295U") /* UINT_MAX */; fulldesc = (char *)calloc(len + 1, sizeof(char)); len = snprintf(fulldesc, len + 1, _("; Case for value 0x%08x (%d)"), value, value); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, fulldesc, len, RTT_INDICATION, NULL); + g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, fulldesc, len, RTT_INDICATION, NULL); free(fulldesc); @@ -303,10 +304,10 @@ static void mark_all_switch_cases(const GArchInstruction *instr, const dex_switc g_arch_instruction_get_location(next, NULL, NULL, &addr); line = g_code_buffer_insert_at(buffer, addr, true); - g_buffer_line_start_merge_at(line, BLC_ASSEMBLY_HEAD); + g_buffer_line_start_merge_at(line, DLC_ASSEMBLY_HEAD); fulldesc = _("; Default case"); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, + g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, fulldesc, strlen(fulldesc), RTT_INDICATION, NULL); } diff --git a/plugins/androhelpers/try_n_catch.c b/plugins/androhelpers/try_n_catch.c index 137c62f..e859718 100644 --- a/plugins/androhelpers/try_n_catch.c +++ b/plugins/androhelpers/try_n_catch.c @@ -30,6 +30,7 @@ #include <format/dex/dex-int.h> #include <format/dex/pool.h> +#include <gtkext/gtkblockdisplay.h> #include <../i18n.h> @@ -206,15 +207,15 @@ static void mark_exception_handlers(const GLoadedBinary *binary, uleb128_t size, for (j = 0; j < count[i]; j++) { line = g_code_buffer_insert_at(buffer, handlers[i][j].addr, true); - g_buffer_line_start_merge_at(line, BLC_ASSEMBLY_HEAD); + g_buffer_line_start_merge_at(line, DLC_ASSEMBLY_HEAD); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, "; ", 2, RTT_INDICATION, NULL); + g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, "; ", 2, RTT_INDICATION, NULL); len = strlen(_("Handler for caught '%s'")) + strlen(handlers[i][j].desc); fulldesc = (char *)calloc(len + 1, sizeof(char)); snprintf(fulldesc, len + 1, _("Handler for caught '%s'"), handlers[i][j].desc); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, fulldesc, len, RTT_INDICATION, NULL); + g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, fulldesc, len, RTT_INDICATION, NULL); free(fulldesc); |