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

Fix comments and whitespace (#11781)

Browse Source
This commit is contained in:
fcasal 2018-10-10 05:19:56 +01:00 committed by Anton Kochkov
parent b1b3b5e150
commit 871662e74c
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libr/core/cmd_anal.c
View File

@ -744,7 +744,7 @@ static void find_refs(RCore *core, const char *glob) {
glob = "str.";
}
if (*glob == '?') {
eprintf ("Usage: arf [flag-str-filter]\n");
eprintf ("Usage: axF [flag-str-filter]\n");
return;
}
eprintf ("Finding references of flags matching '%s'...\n", glob);
@ -5732,7 +5732,7 @@ static bool cmd_anal_refs(RCore *core, const char *input) {
} else {
addr = core->offset;
}
if (input[1] == '.') { // axf.
if (input[1] == '.') { // "axf."
list = list_ = r_anal_xrefs_get_from (core->anal, addr);
if (!list) {
list = r_anal_fcn_get_refs (core->anal, fcn);
@ -5742,11 +5742,11 @@ static bool cmd_anal_refs(RCore *core, const char *input) {
}
if (list) {
if (input[1] == 'q') { // axfq
if (input[1] == 'q') { // "axfq"
r_list_foreach (list, iter, ref) {
r_cons_printf ("0x%" PFMT64x "\n", ref->at);
}
} else if (input[1] == 'j') { // axfj
} else if (input[1] == 'j') { // "axfj"
r_cons_print ("[");
r_list_foreach (list, iter, ref) {
r_io_read_at (core->io, ref->at, buf, 12);
@ -5756,13 +5756,13 @@ static bool cmd_anal_refs(RCore *core, const char *input) {
ref->at, ref->addr, r_anal_xrefs_type_tostring (ref->type), r_asm_op_get_asm (&asmop), iter->n? ",": "");
}
r_cons_print ("]\n");
} else if (input[1] == '*') { // axf*
} else if (input[1] == '*') { // "axf*"
// TODO: implement multi-line comments
r_list_foreach (list, iter, ref) {
r_cons_printf ("CCa 0x%" PFMT64x " \"XREF from 0x%" PFMT64x "\n",
ref->at, ref->type, r_asm_op_get_asm (&asmop), iter->n? ",": "");
}
} else { // axf
} else { // "axf"
char str[512];
int has_color = core->print->flags & R_PRINT_FLAGS_COLOR;
r_list_foreach (list, iter, ref) {
@ -5792,13 +5792,13 @@ static bool cmd_anal_refs(RCore *core, const char *input) {
}
}
} else {
if (input[1] == 'j') { // axfj
if (input[1] == 'j') { // "axfj"
r_cons_print ("[]\n");
}
}
r_list_free (list);
} break;
case 'F':
case 'F': // "axF"
find_refs (core, input + 1);
break;
case 'C': // "axC"

28
libr/core/cmd_search.c
View File

@ -1645,11 +1645,11 @@ static int emulateSyscallPrelude(RCore *core, ut64 at, ut64 curpc) {
r_io_read_at (core->io, curpc, arr, bsize);
}
inslen = r_anal_op (core->anal, &aop, curpc, arr + i, bsize - i, R_ANAL_OP_MASK_BASIC);
if (inslen) {
if (inslen) {
int incr = (core->search->align > 0)? core->search->align - 1: inslen - 1;
if (incr < 0) {
incr = minopcode;
}
}
i += incr;
curpc += incr;
if (r_anal_op_nonlinear (aop.type)) { // skip the instr
@ -1839,12 +1839,12 @@ static void do_ref_search(RCore *core, ut64 addr,ut64 from, ut64 to, struct sear
r_core_cmd (core, param->cmd_hit, 0);
r_core_seek (core, here, true);
}
}
}
free (buf_fcn);
}
}
}
r_list_free (list);
}
}
static bool do_anal_search(RCore *core, struct search_parameters *param, const char *input) {
RSearch *search = core->search;
@ -2443,7 +2443,7 @@ static ut8 *v_writebuf(RCore *core, RList *nums, int len, char ch, int bsize) {
eprintf ("Cannot allocate %d byte(s)\n", bsize);
free (buf);
return NULL;
}
}
ptr = buf;
for (i = 0; i < len; i++) {
switch (ch) {
@ -2456,22 +2456,22 @@ static ut8 *v_writebuf(RCore *core, RList *nums, int len, char ch, int bsize) {
n16 = r_num_math (core->num, r_list_pop_head (nums));
r_write_le16 (ptr, n16);
ptr = (ut8 *) ptr + sizeof (ut16);
break;
break;
case '4':
n32 = (ut32)r_num_math (core->num, r_list_pop_head (nums));
r_write_le32 (ptr, n32);
ptr = (ut8 *) ptr + sizeof (ut32);
break;
default:
default:
case '8':
n64 = r_num_math (core->num, r_list_pop_head (nums));
r_write_le64 (ptr, n64);
ptr = (ut8 *) ptr + sizeof (ut64);
break;
break;
}
if (ptr > ptr + bsize) {
return NULL;
}
}
}
return buf;
}
@ -2853,7 +2853,7 @@ reread:
}
if (r_cons_is_breaked ()) {
break;
}
}
}
}
break;
@ -3131,7 +3131,7 @@ reread:
case '8':
if (input[param_offset]) {
bsize = sizeof (ut64) * len;
v_buf = v_writebuf (core, nums, len, '8', bsize);
v_buf = v_writebuf (core, nums, len, '8', bsize);
} else {
eprintf ("Usage: /v8 value\n");
}
@ -3147,7 +3147,7 @@ reread:
case '2':
if (input[param_offset]) {
bsize = sizeof (ut16) * len;
v_buf = v_writebuf (core, nums, len, '2', bsize);
v_buf = v_writebuf (core, nums, len, '2', bsize);
} else {
eprintf ("Usage: /v2 value\n");
}
@ -3168,7 +3168,7 @@ reread:
r_search_kw_add (core->search,
r_search_keyword_new ((const ut8 *) v_buf, bsize, NULL, 0, NULL));
free (v_buf);
}
}
r_search_begin (core->search);
dosearch = true;
break;