From 654890b9bcc64338b6d7945ef4e5c6e3e3f7971a Mon Sep 17 00:00:00 2001 From: Juho Kuisma Date: Fri, 17 Jan 2025 16:04:33 +0200 Subject: [PATCH] Rename r_bin_symbol_unsafe -> r_bin_import_tags --- libr/bin/bin.c | 3 +-- libr/core/cbin.c | 2 +- libr/core/cmd_info.inc.c | 4 ++-- libr/include/r_bin.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libr/bin/bin.c b/libr/bin/bin.c index aa86fd780152e..adbda9e78c015 100644 --- a/libr/bin/bin.c +++ b/libr/bin/bin.c @@ -195,8 +195,7 @@ R_API RBinSymbol *r_bin_symbol_clone(RBinSymbol *bs) { } // query the symbol name into the symtypes database -// XXX R2_600 rename to r_bin_import_tags -R_API const char *r_bin_symbol_unsafe(RBin *bin, const char *name) { +R_API const char *r_bin_import_tags(RBin *bin, const char *name) { Sdb *db = sdb_ns (bin->sdb, "symclass", true); // R2_600 - rename to imptags if (db) { return sdb_const_get (db, name, 0); diff --git a/libr/core/cbin.c b/libr/core/cbin.c index 305bb36044b52..21c2ac9b0c3f0 100644 --- a/libr/core/cbin.c +++ b/libr/core/cbin.c @@ -2632,7 +2632,7 @@ static bool bin_symbols(RCore *r, PJ *pj, int mode, ut64 laddr, int va, ut64 at, pj_ki (pj, "ordinal", symbol->ordinal); pj_ks (pj, "bind", symbol->bind); pj_kn (pj, "size", (ut64)symbol->size); - const char *safetyName = r_bin_symbol_unsafe (r->bin, name); + const char *safetyName = r_bin_import_tags (r->bin, name); if (safetyName) { pj_ks (pj, "unsafe", safetyName); } diff --git a/libr/core/cmd_info.inc.c b/libr/core/cmd_info.inc.c index 5a6a9babc9a90..6d89cdd9b4211 100644 --- a/libr/core/cmd_info.inc.c +++ b/libr/core/cmd_info.inc.c @@ -383,7 +383,7 @@ static RList *uniqrefs_for(RCore *core, ut64 addr) { static void cmd_iic2(RCore *core, int mode, const char *symname) { if (symname && !mode) { - const char *un = r_bin_symbol_unsafe (core->bin, symname); + const char *un = r_bin_import_tags (core->bin, symname); if (R_STR_ISNOTEMPTY (un)) { r_cons_println (un); } @@ -395,7 +395,7 @@ static void cmd_iic2(RCore *core, int mode, const char *symname) { Sdb *db = sdb_new0 (); r_list_foreach (imports, iter, imp) { const char *name = r_bin_name_tostring2 (imp->name, 'o'); - const char *un = r_bin_symbol_unsafe (core->bin, name); + const char *un = r_bin_import_tags (core->bin, name); if (!un) { R_LOG_DEBUG ("Symbol not classified %s", name); continue; diff --git a/libr/include/r_bin.h b/libr/include/r_bin.h index 49f5c771c20fb..a0c0eaa0f85d5 100644 --- a/libr/include/r_bin.h +++ b/libr/include/r_bin.h @@ -742,7 +742,7 @@ R_API RBinSection *r_bin_section_clone(RBinSection *s); R_API void r_bin_info_free(RBinInfo *rb); R_API void r_bin_import_free(RBinImport *imp); R_API void r_bin_symbol_free(void *sym); -R_API const char *r_bin_symbol_unsafe(RBin *bin, const char *name); +R_API const char *r_bin_import_tags(RBin *bin, const char *name); R_API RBinSymbol *r_bin_symbol_new(const char *name, ut64 paddr, ut64 vaddr); R_API RBinSymbol *r_bin_symbol_clone(RBinSymbol *bs); R_API void r_bin_symbol_copy(RBinSymbol *dst, RBinSymbol *src);