diff --git a/libr/anal/fcn.c b/libr/anal/fcn.c index b667f338ea..21d846e702 100644 --- a/libr/anal/fcn.c +++ b/libr/anal/fcn.c @@ -454,7 +454,6 @@ static bool fcn_takeover_block_recursive_followthrough_cb(RAnalBlock *block, voi block->parent_stackptr -= ctx->stack_diff; r_anal_function_add_block (our_fcn, block); // TODO: add block->ninstr from our_fcn considering delay slots - our_fcn += block->ninstr; r_anal_block_unref (block); return true; } diff --git a/libr/bin/bobj.c b/libr/bin/bobj.c index 118fdb336b..9aac0a3ec6 100644 --- a/libr/bin/bobj.c +++ b/libr/bin/bobj.c @@ -116,8 +116,6 @@ static RList *classes_from_symbols(RBinFile *bf) { if (!mn) { mn = strstr (dn, cn); if (mn && mn[strlen (cn)] == '.') { - mn += strlen (cn) + 1; - // eprintf ("METHOD %s %s\n", sym->classname, mn); r_list_append (c->methods, sym); } } diff --git a/libr/bin/mangling/microsoft_demangle.c b/libr/bin/mangling/microsoft_demangle.c index 8ed929d662..3e4202bc6c 100644 --- a/libr/bin/mangling/microsoft_demangle.c +++ b/libr/bin/mangling/microsoft_demangle.c @@ -398,7 +398,6 @@ static size_t get_operator_code(const char *buf, RList *names_l, bool memorize) return 0; } r_list_append (names_l, str_info); - buf += i; read_len += i; break; } diff --git a/libr/bin/pdb/dbi.c b/libr/bin/pdb/dbi.c index 8aa944503f..066023ee44 100644 --- a/libr/bin/pdb/dbi.c +++ b/libr/bin/pdb/dbi.c @@ -88,9 +88,7 @@ static int parse_dbi_ex_header(char *data, int max_len, SDBIExHeader *dbi_ex_hea parse_sctring(&dbi_ex_header->modName, (unsigned char *)data, &read_bytes, max_len); data += (read_bytes - before_read_bytes); - before_read_bytes = read_bytes; parse_sctring(&dbi_ex_header->objName, (unsigned char *)data, &read_bytes, max_len); - data += (read_bytes - before_read_bytes); return read_bytes; } diff --git a/libr/core/canal.c b/libr/core/canal.c index 0f10a95dbd..2d1b45c44e 100644 --- a/libr/core/canal.c +++ b/libr/core/canal.c @@ -1914,7 +1914,7 @@ R_API int r_core_anal_esil_fcn(RCore *core, ut64 at, ut64 from, int reftype, int } esil = R_STRBUF_SAFEGET (&op->esil); eprintf ("0x%08"PFMT64x" %d %s\n", at, op->size, esil); - at += op->size; + // at += op->size; // esilIsRet() // esilIsCall() // esilIsJmp() diff --git a/libr/core/core.c b/libr/core/core.c index 804ef34b0a..0e9ebb820f 100644 --- a/libr/core/core.c +++ b/libr/core/core.c @@ -1901,14 +1901,13 @@ R_API void r_core_autocomplete(R_NULLABLE RCore *core, RLineCompletion *completi SdbList *sls = sdb_foreach_list (core->print->formats, false); SdbListIter *iter; SdbKv *kv; - int j = 0; ls_foreach (sls, iter, kv) { int len = strlen (buf->data + chr); int minlen = R_MIN (len, strlen (sdbkv_key (kv))); if (!len || !strncmp (buf->data + chr, sdbkv_key (kv), minlen)) { char *p = strchr (buf->data + chr, '.'); if (p) { - j += autocomplete_pfele (core, completion, sdbkv_key (kv), pfx, j, p + 1); + autocomplete_pfele (core, completion, sdbkv_key (kv), pfx, 0, p + 1); break; } else { char *s = r_str_newf ("pf%s.%s", pfx, sdbkv_key (kv)); diff --git a/libr/core/disasm.c b/libr/core/disasm.c index 5150642ccb..9030291440 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -3630,10 +3630,6 @@ static void ds_align_comment(RDisasmState *ds) { static void ds_print_dwarf(RDisasmState *ds) { if (ds->show_dwarf) { - int len = ds->opstr? strlen (ds->opstr): 0; - if (len < 30) { - len = 30 - len; - } // TODO: cache value in ds int dwarfFile = (int)ds->dwarfFile + (int)ds->dwarfAbspath; free (ds->sl); diff --git a/libr/core/linux_heap_jemalloc.c b/libr/core/linux_heap_jemalloc.c index f9851b3b74..1000b3266f 100644 --- a/libr/core/linux_heap_jemalloc.c +++ b/libr/core/linux_heap_jemalloc.c @@ -182,8 +182,6 @@ static void GH(jemalloc_get_chunks)(RCore *core, const char *input) { return; } - input += 1; - if (GH(r_resolve_jemalloc) (core, "je_arenas", &sym)) { r_io_read_at (core->io, sym, (ut8 *)&arenas, sizeof (GHT)); for (;;) { diff --git a/libr/core/panels.c b/libr/core/panels.c index 839570f0dd..8487f3b8a6 100644 --- a/libr/core/panels.c +++ b/libr/core/panels.c @@ -6124,7 +6124,6 @@ R_API bool r_core_panels_load(RCore *core, const char *_name) { } tmp_cfg += strlen (tmp_cfg) + 1; } - p_cfg += strlen (p_cfg) + 1; free (panels_config); if (!panels->n_panels) { free (tmp_cfg); diff --git a/libr/core/visual.c b/libr/core/visual.c index 6f23f7e5f8..6dcca676ef 100644 --- a/libr/core/visual.c +++ b/libr/core/visual.c @@ -3038,8 +3038,7 @@ R_API int r_core_visual_cmd(RCore *core, const char *arg) { ut64 addr = UT64_MAX; if (isDisasmPrint (core->printidx)) { if (core->print->screen_bounds == core->offset) { - ut64 addr = core->print->screen_bounds; - addr += r_asm_disassemble (core->rasm, &op, core->block, 32); + r_asm_disassemble (core->rasm, &op, core->block, 32); } if (addr == core->offset || addr == UT64_MAX) { addr = core->offset + 48; diff --git a/libr/util/buf.c b/libr/util/buf.c index 02c33b3d37..48c9944167 100644 --- a/libr/util/buf.c +++ b/libr/util/buf.c @@ -401,7 +401,6 @@ R_API char *r_buf_get_string(RBuffer *b, ut64 addr) { while (r > 0) { const ut8 *needle = r_mem_mem (res + sz, r, (ut8 *)"\x00", 1); if (needle) { - sz += (needle - (res + sz)); null_found = true; break; }