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

Refactor printformat (#16627)

Browse Source
This commit is contained in:
Liumeo 2020-04-18 05:08:46 -04:00 committed by GitHub
parent 784aa48c05
commit a571894042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libr/core/visual.c
View File

@ -434,64 +434,45 @@ R_API void r_core_visual_showcursor(RCore *core, int x) {
r_cons_flush ();
}
static void nextPrintFormat(RCore *core) {
static void printFormat(RCore *core, const int next) {
switch (core->printidx) {
case R_CORE_VISUAL_MODE_PX: // 0 // xc
r_core_visual_applyHexMode (core, ++hexMode);
hexMode += next;
r_core_visual_applyHexMode (core, hexMode);
printfmtSingle[0] = printHexFormats[R_ABS(hexMode) % PRINT_HEX_FORMATS];
break;
case R_CORE_VISUAL_MODE_PD: // pd
r_core_visual_applyDisMode (core, ++disMode);
disMode += next;
r_core_visual_applyDisMode (core, disMode);
printfmtSingle[1] = rotateAsmemu (core);
break;
case R_CORE_VISUAL_MODE_DB: // debugger
r_core_visual_applyDisMode (core, ++disMode);
disMode += next;
r_core_visual_applyDisMode (core, disMode);
printfmtSingle[1] = rotateAsmemu (core);
current3format++;
current3format += next;
currentFormat = R_ABS (current3format) % PRINT_3_FORMATS;
printfmtSingle[2] = print3Formats[currentFormat];
break;
case R_CORE_VISUAL_MODE_OV: // overview
current4format++;
current4format += next;
currentFormat = R_ABS (current4format) % PRINT_4_FORMATS;
printfmtSingle[3] = print4Formats[currentFormat];
break;
case R_CORE_VISUAL_MODE_CD: // code
current5format++;
current5format += next;
currentFormat = R_ABS (current5format) % PRINT_5_FORMATS;
printfmtSingle[4] = print5Formats[currentFormat];
break;
}
}
static void prevPrintFormat(RCore *core) {
switch (core->printidx) {
case R_CORE_VISUAL_MODE_PX: // 0 // xc
r_core_visual_applyHexMode (core, --hexMode);
printfmtSingle[0] = printHexFormats[R_ABS(hexMode) % PRINT_HEX_FORMATS];
break;
case R_CORE_VISUAL_MODE_PD: // pd
r_core_visual_applyDisMode (core, --disMode);
printfmtSingle[1] = rotateAsmemu (core);
break;
case R_CORE_VISUAL_MODE_DB: // debugger
r_core_visual_applyDisMode (core, --disMode);
printfmtSingle[1] = rotateAsmemu (core);
current3format--;
currentFormat = R_ABS (current3format) % PRINT_3_FORMATS;
printfmtSingle[2] = print3Formats[currentFormat];
break;
case R_CORE_VISUAL_MODE_OV: // overview
current4format--;
currentFormat = R_ABS (current4format) % PRINT_4_FORMATS;
printfmtSingle[3] = print4Formats[currentFormat];
break;
case R_CORE_VISUAL_MODE_CD: // code
current5format--;
currentFormat = R_ABS (current5format) % PRINT_5_FORMATS;
printfmtSingle[4] = print5Formats[currentFormat];
break;
}
static inline void nextPrintFormat(RCore *core) {
printFormat (core, 1);
}
static inline void prevPrintFormat(RCore *core) {
printFormat (core, -1);
}
static int color = 1;
@ -4352,5 +4333,5 @@ R_API void r_listinfo_free (RListInfo *info) {
}
free (info->name);
free (info->extra);
R_FREE (info);
free (info);
}