Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-23 22:36:27 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

core/config: rename var to enable/disable marks before disasm

Browse Source
This commit is contained in:
Riccardo Schirone 2015-07-15 00:22:20 +02:00
parent 9d92712cea
commit 99ac4461c4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/config.c
View File

@ -1109,7 +1109,7 @@ R_API int r_core_config_init(RCore *core) {
SETPREF("asm.xrefs", "true", "Show xrefs in disassembly");
SETPREF("asm.demangle", "true", "Show demangled symbols in disasm");
SETPREF("asm.describe", "false", "Show opcode description");
SETPREF("asm.cursor", "true", "Show cursor before the disassembly");
SETPREF("asm.marks", "true", "Show marks before the disassembly");
SETCB("bin.filter", "true", &cb_binfilter, "Filter symbol names to fix dupped names");
SETCB("bin.force", "", &cb_binforce, "Force that rbin plugin");
SETPREF("bin.lang", "", "Language for bin.demangle");

6
libr/core/disasm.c
View File

@ -79,7 +79,7 @@ typedef struct r_disam_options_t {
int show_xrefs;
int show_functions;
int show_fcncalls;
int show_cursor;
int show_marks;
int cursor;
int show_comment_right_default;
int flagspace_ports;
@ -324,7 +324,7 @@ static RDisasmState * handle_init_ds (RCore * core) {
ds->show_comment_right_default = r_config_get_i (core->config, "asm.cmtright");
ds->show_comment_right = r_config_get_i (core->config, "asm.cmtright"); // XX conflict with show_comment_right_default
ds->show_flag_in_bytes = r_config_get_i (core->config, "asm.flagsinbytes");
ds->show_cursor = r_config_get_i (core->config, "asm.cursor");
ds->show_marks = r_config_get_i (core->config, "asm.marks");
ds->pre = strdup (" ");
ds->ocomment = NULL;
ds->linesopts = 0;
@ -763,7 +763,7 @@ static void handle_atabs_option(RCore *core, RDisasmState *ds) {
}
static void handle_print_show_cursor (RCore *core, RDisasmState *ds) {
if (!ds->show_cursor) return;
if (!ds->show_marks) return;
int q = core->print->cur_enabled &&
ds->cursor >= ds->index &&