Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-14 00:38:55 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix color and indentation issues in some comments

Browse Source
This commit is contained in:
pancake 2015-06-29 11:37:18 +02:00
parent c576ca036b
commit 7851b75e5c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libr/core/disasm.c
View File

@ -1722,13 +1722,16 @@ static void handle_print_cc_update (RCore *core, RDisasmState *ds) {
}
// if doesnt fits in screen newline
if (cmtright) {
handle_comment_align (core, ds);
if (ds->show_color)
r_cons_printf (" ;"Color_RESET"%s%s%s"Color_RESET, ds->pal_comment, ccstr, tmp);
r_cons_printf (" "Color_RESET"%s;%s%s"Color_RESET,
ds->pal_comment, ccstr, tmp);
else r_cons_printf (" ;%s%s", ccstr, tmp);
} else {
if (ds->show_color)
r_cons_printf ("\n%s%s%s%s%s"Color_RESET" ^- %s%s"Color_RESET,
ds->color_fline, ds->pre, ds->color_flow, sn, ds->refline, ccstr, tmp);
r_cons_printf ("\n%s%s%s%s%s "Color_RESET"^-%s %s%s"Color_RESET,
ds->color_fline, ds->pre, ds->color_flow,
sn, ds->refline, ds->pal_comment, ccstr, tmp);
else r_cons_printf ("\n%s%s%s ^- %s%s", ds->pre, ds->refline, sn, ccstr, tmp);
}
}
@ -1862,8 +1865,8 @@ static void comment_newline (RCore *core, RDisasmState *ds) {
sn = ds->show_section? getSectionName (core, ds->at): "";
handle_comment_align (core, ds);
if (ds->show_color) {
r_cons_printf ("\n%s%s%s%s"Color_RESET" ^- ",
ds->color_fline, ds->pre, sn, ds->refline);
r_cons_printf ("\n%s%s%s%s"Color_RESET" ^- %s",
ds->color_fline, ds->pre, sn, ds->refline, ds->pal_comment);
} else {
r_cons_printf ("\n%s%s%s ^- ", ds->pre, sn, ds->refline);
}
@ -1908,17 +1911,17 @@ static void handle_print_ptr (RCore *core, RDisasmState *ds, int len, int idx) {
const char *flag = "";
f = r_flag_get_i (core->flags, p);
if (f) flag = f->name;
r_cons_printf (" ; 0x%"PFMT64x" %s%s", p, *flag?"; ":"", flag);
r_cons_printf (" ; 0x%"PFMT64x" %s%s", p, *flag?"; ":"", flag);
} else {
if (n==UT32_MAX || n==UT64_MAX) {
r_cons_printf (" ; [0x%"PFMT64x":%d]=-1", p, ds->analop.refptr);
r_cons_printf (" ; [0x%"PFMT64x":%d]=-1", p, ds->analop.refptr);
} else if (n == n32 && (n32>-512 && n32 <512)) {
r_cons_printf (" ; [0x%"PFMT64x":%d]=%"PFMT64d, p, ds->analop.refptr, n);
r_cons_printf (" ; [0x%"PFMT64x":%d]=%"PFMT64d, p, ds->analop.refptr, n);
} else {
const char *flag = "";
f = r_flag_get_i (core->flags, n);
if (f) flag = f->name;
r_cons_printf (" ; [0x%"PFMT64x":%d]=0x%"PFMT64x" %s",
r_cons_printf (" ; [0x%"PFMT64x":%d]=0x%"PFMT64x" %s",
p, ds->analop.refptr, n, flag);
}
}