From fc19739da1a5f1317eb9e9d2933bc7dff5c9caf1 Mon Sep 17 00:00:00 2001
From: Juho Kuisma <kuisma.juho+github@gmail.com>
Date: Fri, 17 Jan 2025 16:32:31 +0200
Subject: [PATCH] Rename r_flag_get_i -> r_flag_get_item

---
 libr/anal/global.c        |  2 +-
 libr/asm/filter.c         |  2 +-
 libr/core/canal.c         | 22 +++++++++++-----------
 libr/core/carg.c          |  2 +-
 libr/core/cmd_anal.inc.c  | 12 ++++++------
 libr/core/cmd_flag.inc.c  | 22 +++++++++++-----------
 libr/core/cmd_meta.inc.c  |  2 +-
 libr/core/cmd_print.inc.c |  8 ++++----
 libr/core/core.c          | 10 +++++-----
 libr/core/disasm.c        | 32 ++++++++++++++++----------------
 libr/core/numvars.inc.c   |  2 +-
 libr/core/pseudo.c        |  2 +-
 libr/core/vmenus.c        |  8 ++++----
 libr/flag/flag.c          |  7 +++----
 libr/include/r_flag.h     |  2 +-
 test/unit/test_flags.c    |  6 +++---
 16 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/libr/anal/global.c b/libr/anal/global.c
index 651b5bb570a51..704a0d0a984a8 100644
--- a/libr/anal/global.c
+++ b/libr/anal/global.c
@@ -7,7 +7,7 @@
 
 R_API RFlagItem *r_anal_global_get(RAnal *anal, ut64 addr) {
 	RFlag *flags = anal->flb.f;
-	RFlagItem *fi = r_flag_get_i (flags, addr);
+	RFlagItem *fi = r_flag_get_item (flags, addr);
 	if (fi && fi->space && fi->space->name && !strcmp (fi->space->name, GLOBAL_FLAGSPACE)) {
 		return fi;
 	}
diff --git a/libr/asm/filter.c b/libr/asm/filter.c
index 5fd5087ce6f1d..a04b65e78c1e7 100644
--- a/libr/asm/filter.c
+++ b/libr/asm/filter.c
@@ -248,7 +248,7 @@ static char *filter(RAsmPluginSession *aps, ut64 addr, RFlag *f, RAnalHint *hint
 					}
 				}
 				if (flag && !strncmp (flag->name, "section.", 8)) {
-					flag = r_flag_get_i (f, off);
+					flag = r_flag_get_item (f, off);
 				}
 				const char *label = fcn? p->label_get (fcn, off): NULL;
 				if (label || isvalidflag (flag)) {
diff --git a/libr/core/canal.c b/libr/core/canal.c
index c2babc13bd3ab..4b50b251bbd5a 100644
--- a/libr/core/canal.c
+++ b/libr/core/canal.c
@@ -251,7 +251,7 @@ R_API ut64 r_core_anal_address(RCore *core, ut64 addr) {
 			}
 		}
 	}
-	if (r_flag_get_i (core->flags, addr)) {
+	if (r_flag_get_item (core->flags, addr)) {
 		types |= R_ANAL_ADDR_TYPE_FLAG;
 	}
 	if (r_anal_get_fcn_in (core->anal, addr, 0)) {
@@ -421,7 +421,7 @@ static char *autoname_basic(RCore *core, RAnalFunction *fcn, int mode) {
 	RVecAnalRef *refs = r_anal_function_get_refs (fcn);
 	if (refs) {
 		R_VEC_FOREACH (refs, ref) {
-			RFlagItem *f = r_flag_get_i (core->flags, ref->addr);
+			RFlagItem *f = r_flag_get_item (core->flags, ref->addr);
 			if (!f) {
 				continue;
 			}
@@ -888,7 +888,7 @@ static void function_rename(RFlag *flags, RAnalFunction *fcn) {
 		const char *fcnpfx = r_anal_functiontype_tostring (fcn->type);
 		const char *restofname = fcn->name + strlen ("loc.");
 		fcn->name = r_str_newf ("%s.%s", fcnpfx, restofname);
-		RFlagItem *f = r_flag_get_i (flags, fcn->addr);
+		RFlagItem *f = r_flag_get_item (flags, fcn->addr);
 		if (f) {
 			r_flag_rename (flags, f, fcn->name);
 		}
@@ -904,7 +904,7 @@ static void autoname_imp_trampoline(RCore *core, RAnalFunction *fcn) {
 			RAnalRef *ref = RVecAnalRef_at (refs, 0);
 			int rt = R_ANAL_REF_TYPE_MASK (ref->type);
 			if (rt != R_ANAL_REF_TYPE_CALL) { /* Some fcns don't return */
-				RFlagItem *flg = r_flag_get_i (core->flags, ref->addr);
+				RFlagItem *flg = r_flag_get_item (core->flags, ref->addr);
 				if (flg && r_str_startswith (flg->name, "sym.imp.")) {
 					R_FREE (fcn->name);
 					fcn->name = r_str_newf ("sub.%s", flg->name + 8);
@@ -2361,7 +2361,7 @@ R_API void r_core_anal_datarefs(RCore *core, ut64 addr) {
 					r_cons_printf ("agn %s\n", me);
 					found = true;
 				}
-				RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
+				RFlagItem *item = r_flag_get_item (core->flags, ref->addr);
 				r_strf_buffer (32);
 				const char *dst = item? item->name: r_strf ("0x%08"PFMT64x, ref->addr);
 				r_cons_printf ("agn %s\n", dst);
@@ -2390,7 +2390,7 @@ R_API void r_core_anal_coderefs(RCore *core, ut64 addr) {
 				continue;
 			}
 			r_strf_buffer (32);
-			RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
+			RFlagItem *item = r_flag_get_item (core->flags, ref->addr);
 			const char *dst = item? item->name: r_strf ("0x%08"PFMT64x, ref->addr);
 			r_cons_printf ("agn %s\n", dst);
 			r_cons_printf ("age %s %s\n", me, dst);
@@ -2427,7 +2427,7 @@ static void add_single_addr_xrefs(RCore *core, ut64 addr, RGraph *graph) {
 		if (ref->addr == UT64_MAX) {
 			continue;
 		}
-		RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
+		RFlagItem *item = r_flag_get_item (core->flags, ref->addr);
 		char *src = item? strdup (item->name): r_str_newf ("0x%08" PFMT64x, ref->addr);
 		RGraphNode *reference_from = r_graph_add_node_info (graph, src, NULL, ref->addr);
 		free (src);
@@ -2577,7 +2577,7 @@ R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
 			break;
 		case R_GRAPH_FORMAT_GML:
 		case R_GRAPH_FORMAT_GMLFCN: {
-			RFlagItem *flag = r_flag_get_i (core->flags, fcni->addr);
+			RFlagItem *flag = r_flag_get_item (core->flags, fcni->addr);
 			if (iteration == 0) {
 				char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, fcni->addr);
 				r_cons_printf ("  node [\n"
@@ -2609,7 +2609,7 @@ R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
 		}
 		r_list_foreach (calls, iter2, fcnr) {
 			// TODO: display only code or data refs?
-			RFlagItem *flag = r_flag_get_i (core->flags, fcnr->addr);
+			RFlagItem *flag = r_flag_get_item (core->flags, fcnr->addr);
 			char *fcnr_name = (flag && flag->name) ? flag->name : r_str_newf ("unk.0x%"PFMT64x, fcnr->addr);
 			switch (fmt) {
 			case R_GRAPH_FORMAT_GMLFCN:
@@ -3057,7 +3057,7 @@ static int fcn_print_makestyle(RCore *core, RList *fcns, char mode, bool unique,
 			// Iterate over all refs from a function
 			Sdb *uniq = unique ? sdb_new0 (): NULL;
 			R_VEC_FOREACH (refs, refi) {
-				RFlagItem *f = r_flag_get_i (core->flags, refi->addr);
+				RFlagItem *f = r_flag_get_item (core->flags, refi->addr);
 				char *dst = f? strdup (f->name): r_str_newf ("0x%08"PFMT64x, refi->addr);
 				if (unique) {
 					if (sdb_const_get (uniq, dst, NULL)) {
@@ -5327,7 +5327,7 @@ static void cccb(void *u) {
 static bool myvalid(RCore *core, ut64 addr) {
 	RIO *io = core->io;
 #if 1
-	RFlagItem *fi = r_flag_get_i (core->flags, addr);
+	RFlagItem *fi = r_flag_get_item (core->flags, addr);
 	if (fi && strchr (fi->name, '.')) {
 		return true;
 	}
diff --git a/libr/core/carg.c b/libr/core/carg.c
index 875dedeea3fce..6d38ac50cf239 100644
--- a/libr/core/carg.c
+++ b/libr/core/carg.c
@@ -150,7 +150,7 @@ R_API void r_core_print_func_args(RCore *core) {
 			fcn_name = fcn->name;
 		} else {
 			if (core->flags) {
-				RFlagItem *item = r_flag_get_i (core->flags, pcv);
+				RFlagItem *item = r_flag_get_item (core->flags, pcv);
 				if (item) {
 					fcn_name = item->name;
 				}
diff --git a/libr/core/cmd_anal.inc.c b/libr/core/cmd_anal.inc.c
index f9d8ee5b5569e..a25aeead05a09 100644
--- a/libr/core/cmd_anal.inc.c
+++ b/libr/core/cmd_anal.inc.c
@@ -1713,7 +1713,7 @@ static int cmd_an(RCore *core, const char *name, int mode) {
 		}
 		RFlagItem *f = r_flag_get_by_spaces (core->flags, false, tgt_addr, R_FLAGS_FS_SYMBOLS, R_FLAGS_FS_IMPORTS, NULL);
 		if (!f) {
-			f = r_flag_get_i (core->flags, tgt_addr);
+			f = r_flag_get_item (core->flags, tgt_addr);
 		}
 		RAnalFunction *fcn = r_anal_get_function_at (core->anal, tgt_addr);
 		if (fcn) {
@@ -4932,7 +4932,7 @@ static void cmd_afsv(RCore *core, ut64 pcv, int mode) {
 	if (fcn) {
 		fcn_name = fcn->name;
 	} else {
-		RFlagItem *item = r_flag_get_i (core->flags, pcv);
+		RFlagItem *item = r_flag_get_item (core->flags, pcv);
 		if (item) {
 			fcn_name = item->name;
 		}
@@ -8490,7 +8490,7 @@ static void cmd_aep(RCore *core, const char *input) {
 		// find a pin named like the flag, skip dots if any
 		RFlagItem *f = r_flag_get_by_spaces (core->flags, false, addr, R_FLAGS_FS_SYMBOLS, R_FLAGS_FS_IMPORTS, NULL);
 		if (!f) {
-			f = r_flag_get_i (core->flags, addr);
+			f = r_flag_get_item (core->flags, addr);
 		}
 		if (f) {
 			const char *last = r_str_rchr (f->name, NULL, '.');
@@ -9955,7 +9955,7 @@ static void _anal_calls(RCore *core, ut64 addr, ut64 addr_end, bool printCommand
 			if (valid && op.type == R_ANAL_OP_TYPE_CALL) {
 				bool isValidCall = true;
 				if (importsOnly) {
-					RFlagItem *f = r_flag_get_i (core->flags, op.jump);
+					RFlagItem *f = r_flag_get_item (core->flags, op.jump);
 					if (!f || !strstr (f->name, "imp.")) {
 						isValidCall = false;
 					}
@@ -12403,7 +12403,7 @@ static bool r_core_print_bb_gml(RCore *core, RAnalFunction *fcn) {
 	r_cons_printf ("graph\n[\n" "hierarchic 1\n" "label \"\"\n" "directed 1\n");
 
 	r_list_foreach (fcn->bbs, iter, bb) {
-		RFlagItem *flag = r_flag_get_i (core->flags, bb->addr);
+		RFlagItem *flag = r_flag_get_item (core->flags, bb->addr);
 		char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, bb->addr);
 		// TODO char *str = r_str_escape_dot (msg);
 		ht_uu_insert (ht, bb->addr, id);
@@ -15083,7 +15083,7 @@ static void cmd_anal_aC(RCore *core, const char *input) {
 		if (fcn) {
 			fcn_name = fcn->name;
 		} else {
-			RFlagItem *item = r_flag_get_i (core->flags, op->jump);
+			RFlagItem *item = r_flag_get_item (core->flags, op->jump);
 			if (item) {
 				fcn_name = item->name;
 			}
diff --git a/libr/core/cmd_flag.inc.c b/libr/core/cmd_flag.inc.c
index 503298efecb99..e55be4067fb53 100644
--- a/libr/core/cmd_flag.inc.c
+++ b/libr/core/cmd_flag.inc.c
@@ -1388,18 +1388,18 @@ static int cmd_flag(void *data, const char *input) {
 			p = strchr (arg, ' ');
 			if (p) {
 				*p++ = 0;
-				item = r_flag_get_i (core->flags,
+				item = r_flag_get_item (core->flags,
 					r_num_math (core->num, arg));
 				if (item)
 					item->size = r_num_math (core->num, p);
 			} else {
 				if (*arg) {
-					item = r_flag_get_i (core->flags, core->offset);
+					item = r_flag_get_item (core->flags, core->offset);
 					if (item) {
 						item->size = r_num_math (core->num, arg);
 					}
 				} else {
-					item = r_flag_get_i (core->flags, r_num_math (core->num, arg));
+					item = r_flag_get_item (core->flags, r_num_math (core->num, arg));
 					if (item) {
 						r_cons_printf ("0x%08"PFMT64x"\n", item->size);
 					}
@@ -1407,7 +1407,7 @@ static int cmd_flag(void *data, const char *input) {
 			}
 			free (arg);
 		} else { // "fl"
-			item = r_flag_get_i (core->flags, core->offset);
+			item = r_flag_get_item (core->flags, core->offset);
 			if (item) {
 				r_cons_printf ("0x%08"PFMT64x"\n", item->size);
 			}
@@ -1417,7 +1417,7 @@ static int cmd_flag(void *data, const char *input) {
 	case 'd':
 		if (input[1] == ' ') {
 			char cmd[128];
-			RFlagItem *item = r_flag_get_i (core->flags,
+			RFlagItem *item = r_flag_get_item (core->flags,
 				r_num_math (core->num, input+2));
 			if (item) {
 				r_cons_printf ("0x%08"PFMT64x"\n", item->offset);
@@ -1435,7 +1435,7 @@ static int cmd_flag(void *data, const char *input) {
 		break;
 	case 'x':
 		if (input[1] == ' ') {
-			RFlagItem *item = r_flag_get_i (core->flags,
+			RFlagItem *item = r_flag_get_item (core->flags,
 				r_num_math (core->num, input+2));
 			if (item) {
 				r_cons_printf ("0x%08"PFMT64x"\n", item->offset);
@@ -1506,7 +1506,7 @@ static int cmd_flag(void *data, const char *input) {
 				if (input[2] == ' ') {
 					off = r_num_math (core->num, input+2);
 				}
-				RFlagItem *f = r_flag_get_i (core->flags, off);
+				RFlagItem *f = r_flag_get_item (core->flags, off);
 				if (f) {
 					f->space = r_flag_space_cur (core->flags);
 				} else {
@@ -1640,7 +1640,7 @@ static int cmd_flag(void *data, const char *input) {
 					R_LOG_ERROR ("Cannot find flag with name '%s'", p);
 				}
 			} else {
-				item = r_flag_get_i (core->flags, r_num_math (core->num, p));
+				item = r_flag_get_item (core->flags, r_num_math (core->num, p));
 				if (item && item->comment) {
 					r_cons_println (item->comment);
 				} else {
@@ -1674,7 +1674,7 @@ static int cmd_flag(void *data, const char *input) {
 				}
 			} else {
 				new = old;
-				item = r_flag_get_i (core->flags, core->offset);
+				item = r_flag_get_item (core->flags, core->offset);
 			}
 			if (item) {
 				if (!r_flag_rename (core->flags, item, new)) {
@@ -1688,7 +1688,7 @@ static int cmd_flag(void *data, const char *input) {
 		break;
 	case 'N':
 		if (!input[1]) {
-			RFlagItem *item = r_flag_get_i (core->flags, core->offset);
+			RFlagItem *item = r_flag_get_item (core->flags, core->offset);
 			if (item) {
 				r_cons_printf ("%s\n", item->realname);
 			}
@@ -1706,7 +1706,7 @@ static int cmd_flag(void *data, const char *input) {
 				}
 			} else {
 				realname = name;
-				item = r_flag_get_i (core->flags, core->offset);
+				item = r_flag_get_item (core->flags, core->offset);
 			}
 			if (item) {
 				r_flag_item_set_realname (item, realname);
diff --git a/libr/core/cmd_meta.inc.c b/libr/core/cmd_meta.inc.c
index 41d2a4b836c3f..ad036e268c9a1 100644
--- a/libr/core/cmd_meta.inc.c
+++ b/libr/core/cmd_meta.inc.c
@@ -1177,7 +1177,7 @@ static int cmd_meta_others(RCore *core, const char *input) {
 						r_str_ncpy (name, p, sizeof (name));
 					} else {
 						if (type != 'b' && type != 's') {
-							RFlagItem *fi = r_flag_get_i (core->flags, addr);
+							RFlagItem *fi = r_flag_get_item (core->flags, addr);
 							if (fi) {
 								r_str_ncpy (name, fi->name, sizeof (name));
 							}
diff --git a/libr/core/cmd_print.inc.c b/libr/core/cmd_print.inc.c
index f65686bc6cefe..7b27f7ecd180c 100644
--- a/libr/core/cmd_print.inc.c
+++ b/libr/core/cmd_print.inc.c
@@ -847,7 +847,7 @@ static void cmd_prcn(RCore *core, const ut8* block, int len, bool bitsmode) {
 			r_cons_printf (Color_RESET);
 		}
 		if (show_flags) {
-			RFlagItem *fi = r_flag_get_i (core->flags, core->offset + j);
+			RFlagItem *fi = r_flag_get_item (core->flags, core->offset + j);
 			if (fi) {
 				r_cons_printf (" ; %s", fi->name);
 			}
@@ -922,7 +922,7 @@ static void cmd_prc(RCore *core, const ut8* block, int len) {
 			}
 			if (square) {
 				if (show_flags) {
-					RFlagItem *fi = r_flag_get_i (core->flags, core->offset + j);
+					RFlagItem *fi = r_flag_get_item (core->flags, core->offset + j);
 					if (fi) {
 						first_flag_chars (fi->name, &ch, &ch2);
 					} else {
@@ -1044,7 +1044,7 @@ static void cmd_prc_zoom(RCore *core, const char *input) {
 			}
 			if (square) {
 				if (show_flags) {
-					RFlagItem *fi = r_flag_get_i (core->flags, core->offset + j);
+					RFlagItem *fi = r_flag_get_item (core->flags, core->offset + j);
 					if (fi) {
 						if (fi->name[1]) {
 							ch = fi->name[0];
@@ -5742,7 +5742,7 @@ static void r_core_disasm_table(RCore *core, int l, const char *input) {
 		}
 		r_io_read_at (core->io, ea, bytes, op->size); // XXX ranalop should contain the bytes like rasmop do
 		char *sbytes = r_hex_bin2strdup(bytes, op->size);
-		RFlagItem *fi = r_flag_get_i (core->flags, ea);
+		RFlagItem *fi = r_flag_get_item (core->flags, ea);
 		char *fn = fi? fi->name: "";
 		const char *esil = R_STRBUF_SAFEGET (&op->esil);
 		char *refs = __op_refs (core, op, 0);
diff --git a/libr/core/core.c b/libr/core/core.c
index 09c4b2e88e929..880bb2259e513 100644
--- a/libr/core/core.c
+++ b/libr/core/core.c
@@ -240,7 +240,7 @@ static void setab(RCore *core, const char *arch, int bits) {
 }
 
 static const char *getName(RCore *core, ut64 addr) {
-	RFlagItem *item = r_flag_get_i (core->flags, addr);
+	RFlagItem *item = r_flag_get_item (core->flags, addr);
 	if (item) {
 		if (core->flags->realnames) {
 			return item->realname
@@ -368,7 +368,7 @@ static const char *str_callback(RNum *user, ut64 off, int *ok) {
 		*ok = 0;
 	}
 	if (f) {
-		RFlagItem *item = r_flag_get_i (f, off);
+		RFlagItem *item = r_flag_get_item (f, off);
 		if (item) {
 			if (ok) {
 				*ok = true;
@@ -1671,13 +1671,13 @@ R_API int r_core_fgets(char *buf, int len) {
 
 static const char *r_core_print_offname(void *p, ut64 addr) {
 	RCore *c = (RCore*)p;
-	RFlagItem *item = r_flag_get_i (c->flags, addr);
+	RFlagItem *item = r_flag_get_item (c->flags, addr);
 	return item ? item->name : NULL;
 }
 
 static int r_core_print_offsize(void *p, ut64 addr) {
 	RCore *c = (RCore*)p;
-	RFlagItem *item = r_flag_get_i (c->flags, addr);
+	RFlagItem *item = r_flag_get_item (c->flags, addr);
 	return item ? item->size: -1;
 }
 
@@ -1770,7 +1770,7 @@ R_API char *r_core_anal_hasrefs(RCore *core, ut64 value, int mode) {
 		}
 		return res;
 	}
-	RFlagItem *fi = r_flag_get_i (core->flags, value);
+	RFlagItem *fi = r_flag_get_item (core->flags, value);
 	return fi? strdup (fi->name): NULL;
 }
 
diff --git a/libr/core/disasm.c b/libr/core/disasm.c
index 4f5e01ffe3be3..2c9b103a9c3fd 100644
--- a/libr/core/disasm.c
+++ b/libr/core/disasm.c
@@ -1754,7 +1754,7 @@ static int handleMidFlags(RCore *core, RDisasmState *ds, bool print) {
 	}
 
 	for (i = 1; i < ds->oplen; i++) {
-		RFlagItem *fi = r_flag_get_i (core->flags, ds->at + i);
+		RFlagItem *fi = r_flag_get_item (core->flags, ds->at + i);
 		if (fi && fi->name) {
 			const char *finame = fi->name;
 			if (r_anal_get_block_at (core->anal, ds->at)) {
@@ -2469,9 +2469,9 @@ static void ds_show_comments_right(RDisasmState *ds) {
 	if (!ds->show_comments && !ds->show_cmt_user) {
 		return;
 	}
-	RFlagItem *item = r_flag_get_i (core->flags, ds->at);
+	RFlagItem *item = r_flag_get_item (core->flags, ds->at);
 	if (!item && ds->analop.ptr && ds->analop.ptr != UT64_MAX) {
-		item = r_flag_get_i (core->flags, ds->analop.ptr);
+		item = r_flag_get_item (core->flags, ds->analop.ptr);
 	}
 	const char *comment = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, ds->at);
 	// vartype also contains varname, so we use varname color to display it
@@ -3113,7 +3113,7 @@ static void ds_control_flow_comments(RDisasmState *ds) {
 		case R_ANAL_OP_TYPE_JMP:
 		case R_ANAL_OP_TYPE_CJMP:
 		case R_ANAL_OP_TYPE_CALL:
-			item = r_flag_get_i (ds->core->flags, ds->analop.jump);
+			item = r_flag_get_item (ds->core->flags, ds->analop.jump);
 			if (item && item->comment) {
 				if (ds->show_color) {
 					r_cons_print (ds->pal_comment);
@@ -3258,7 +3258,7 @@ R_API char *r_core_get_reloff(RCore *core, int type, ut64 at, st64 *delta) {
 #endif
 	}
 	if (!label && type & RELOFF_TO_FLAG) {
-		// RFlagItem *fi = r_flag_get_i (core->flags, at);
+		// RFlagItem *fi = r_flag_get_item (core->flags, at);
 		RFlagItem *fi = r_flag_get_at (core->flags, at, true);
 #if 0
 		if (fi) {
@@ -3366,7 +3366,7 @@ static char *get_reloff(RDisasmState *ds, ut64 at, st64 *delta) {
 		}
 	}
 	if (!label && type & RELOFF_TO_FLAG) {
-		RFlagItem *fi = r_flag_get_i (core->flags, at);
+		RFlagItem *fi = r_flag_get_item (core->flags, at);
 		if (fi) {
 			ds->lastflag = fi;
 		}
@@ -4805,7 +4805,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
 						printable = false;
 					}
 				}
-				if (printable && r_flag_get_i (core->flags, v)) {
+				if (printable && r_flag_get_item (core->flags, v)) {
 					printable = false;
 				}
 				if (canHaveChar && printable) {
@@ -4834,7 +4834,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
 		R_VEC_FOREACH (refs, ref) {
 			int rt = R_ANAL_REF_TYPE_MASK (ref->type);
 			if (rt == R_ANAL_REF_TYPE_STRN || rt == R_ANAL_REF_TYPE_DATA) {
-				if ((f = r_flag_get_i (core->flags, ref->addr))) {
+				if ((f = r_flag_get_item (core->flags, ref->addr))) {
 					refaddr = ref->addr;
 					break;
 				}
@@ -4861,7 +4861,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
 		const char *kind;
 		char *msg = calloc (sizeof (char), len);
 		if (((st64)p) > 0) {
-			f = r_flag_get_i (core->flags, p);
+			f = r_flag_get_item (core->flags, p);
 			if (f) {
 				ut64 subrel_addr = core->rasm->parse->subrel_addr;
 				if (subrel_addr && subrel_addr != p) {
@@ -4886,7 +4886,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
 			st32 n32 = (st32)(n & UT32_MAX);
 			if (ds->analop.type == R_ANAL_OP_TYPE_LEA) {
 				char str[128] = {0};
-				f = r_flag_get_i (core->flags, refaddr);
+				f = r_flag_get_item (core->flags, refaddr);
 				if (!f && ds->show_slow) {
 					r_io_read_at (ds->core->io, ds->analop.ptr,
 						      (ut8 *)str, sizeof (str) - 1);
@@ -4908,7 +4908,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
 				} else {
 					const char *kind, *flag = "";
 					char *msg2 = NULL;
-					RFlagItem *f2_ = r_flag_get_i (core->flags, n);
+					RFlagItem *f2_ = r_flag_get_item (core->flags, n);
 					if (f2_) {
 						flag = f2_->name;
 					} else {
@@ -4989,7 +4989,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
 			msg[len - 1] = 0;
 		}
 #endif
-		f = r_flag_get_i (core->flags, refaddr);
+		f = r_flag_get_item (core->flags, refaddr);
 		if (f) {
 			if (strlen (msg) != 1) {
 				char *msg2 = strdup (msg);
@@ -5403,7 +5403,7 @@ static bool myregwrite(REsil *esil, const char *name, ut64 *val) {
 		R_FREE (type);
 		if ((ds->printed_flag_addr == UT64_MAX || *val != ds->printed_flag_addr)
 		    && (ds->show_emu_strflag || !emu_str_printed)) {
-			RFlagItem *fi = r_flag_get_i (esil->anal->flb.f, *val);
+			RFlagItem *fi = r_flag_get_item (esil->anal->flb.f, *val);
 			if (fi && (!ds->opstr || !strstr (ds->opstr, fi->name))) {
 				msg = r_str_appendf (msg, "%s%s", R_STR_ISNOTEMPTY (msg)? " " : "", fi->name);
 				if (ds->pj) {
@@ -5679,7 +5679,7 @@ static void ds_comment_call(RDisasmState *ds) {
 	if (fcn) {
 		fcn_name = fcn->name;
 	} else {
-		RFlagItem *item = r_flag_get_i (core->flags, pcv);
+		RFlagItem *item = r_flag_get_item (core->flags, pcv);
 		if (item) {
 			fcn_name = item->name;
 		}
@@ -5915,7 +5915,7 @@ static void ds_print_calls_hints(RDisasmState *ds) {
 			full_name = fcn->name;
 		}
 	} else if (ds->analop.ptr != UT64_MAX) {
-		RFlagItem *flag = r_flag_get_i (ds->core->flags, ds->analop.ptr);
+		RFlagItem *flag = r_flag_get_item (ds->core->flags, ds->analop.ptr);
 		if (flag && flag->space && !strcmp (flag->space->name, R_FLAGS_FS_IMPORTS)) {
 			full_name = flag->realname;
 		}
@@ -7865,7 +7865,7 @@ R_API int r_core_disasm_pdi_with_buf(RCore *core, ut64 address, ut8 *buf, ut32 n
 		ut64 at = addr + i;
 		if (flags) {
 			if (fmt != 'e') { // pie
-				RFlagItem *item = r_flag_get_i (core->flags, at);
+				RFlagItem *item = r_flag_get_item (core->flags, at);
 				if (item) {
 					if (show_offset) {
 						r_print_offset (core->print, at, 0, 0, NULL);
diff --git a/libr/core/numvars.inc.c b/libr/core/numvars.inc.c
index b5ce0524b228d..cbb20cd4d7f61 100644
--- a/libr/core/numvars.inc.c
+++ b/libr/core/numvars.inc.c
@@ -735,7 +735,7 @@ static ut64 numvar_flag(RCore *core, const char *str, int *ok) {
 		free (name);
 	}
 	if (!fi) {
-		fi = r_flag_get_i (core->flags, addr);
+		fi = r_flag_get_item (core->flags, addr);
 		if (!fi) {
 			fi = r_flag_get_at (core->flags, core->offset, true);
 		}
diff --git a/libr/core/pseudo.c b/libr/core/pseudo.c
index a86895f88200e..1ccc3a5679ba7 100644
--- a/libr/core/pseudo.c
+++ b/libr/core/pseudo.c
@@ -723,7 +723,7 @@ R_API int r_core_pseudo_code(RCore *core, const char *input) {
 			} else {
 				NEWLINE (bb->addr, 1);
 			}
-			RFlagItem *fi = r_flag_get_i (core->flags, bb->addr);
+			RFlagItem *fi = r_flag_get_item (core->flags, bb->addr);
 			if (fi && r_str_startswith (fi->name, "case.")) {
 				const char *val = r_str_lchr (fi->name, '.') + 1;
 				char *hex = r_str_newf ("0x%s", val);
diff --git a/libr/core/vmenus.c b/libr/core/vmenus.c
index 2ec5484d2deee..76db0160a4dfc 100644
--- a/libr/core/vmenus.c
+++ b/libr/core/vmenus.c
@@ -4414,7 +4414,7 @@ R_API void r_core_visual_define(RCore *core, const char *args, int distance) {
 			RAnalOp *op = r_core_anal_op (core, off, R_ARCH_OP_MASK_BASIC);
 			if (op) {
 				if (op->jump != UT64_MAX) {
-					RFlagItem *item = r_flag_get_i (core->flags, op->jump);
+					RFlagItem *item = r_flag_get_item (core->flags, op->jump);
 					if (item) {
 						const char *ptr = r_str_lchr (item->name, '.');
 						if (ptr) {
@@ -4463,7 +4463,7 @@ R_API void r_core_visual_define(RCore *core, const char *args, int distance) {
 				}
 			} else if (tgt_addr != UT64_MAX) {
 				RAnalFunction *fcn = r_anal_get_function_at (core->anal, tgt_addr);
-				RFlagItem *f = r_flag_get_i (core->flags, tgt_addr);
+				RFlagItem *f = r_flag_get_item (core->flags, tgt_addr);
 				if (fcn) {
 					q = r_str_newf ("?i Rename function %s to;afn `yp` 0x%"PFMT64x,
 						fcn->name, tgt_addr);
@@ -4489,7 +4489,7 @@ R_API void r_core_visual_define(RCore *core, const char *args, int distance) {
 	}
 	case 'C':
 		{
-			RFlagItem *item = r_flag_get_i (core->flags, off);
+			RFlagItem *item = r_flag_get_item (core->flags, off);
 			if (item) {
 				char cmd[128];
 				r_cons_show_cursor (true);
@@ -4508,7 +4508,7 @@ R_API void r_core_visual_define(RCore *core, const char *args, int distance) {
 		break;
 	case '$':
 		{
-			RFlagItem *item = r_flag_get_i (core->flags, off);
+			RFlagItem *item = r_flag_get_item (core->flags, off);
 			if (item) {
 				char cmd[128];
 				r_cons_printf ("Current flag size is: %" PFMT64d "\n", item->size);
diff --git a/libr/flag/flag.c b/libr/flag/flag.c
index 1fc8765f3d8cf..1cfcda26ad476 100644
--- a/libr/flag/flag.c
+++ b/libr/flag/flag.c
@@ -509,8 +509,7 @@ R_API RFlagItem *r_flag_get(RFlag *f, const char *name) {
 }
 
 /* return the first flag item that can be found at offset "off", or NULL otherwise */
-// R2_600 - rename to r_flag_get_at and r_flag_get_in ??
-R_API RFlagItem *r_flag_get_i(RFlag *f, ut64 off) {
+R_API RFlagItem *r_flag_get_item(RFlag *f, ut64 off) {
 	R_RETURN_VAL_IF_FAIL (f, NULL);
 	if (f->mask) {
 		off &= f->mask;
@@ -857,7 +856,7 @@ R_API bool r_flag_unset(RFlag *f, RFlagItem *item) {
  * return true if such a flag is found and unset, false otherwise. */
 R_API bool r_flag_unset_off(RFlag *f, ut64 off) {
 	R_RETURN_VAL_IF_FAIL (f, false);
-	RFlagItem *item = r_flag_get_i (f, off);
+	RFlagItem *item = r_flag_get_item (f, off);
 	if (item && r_flag_unset (f, item)) {
 		return true;
 	}
@@ -949,7 +948,7 @@ R_API int r_flag_relocate(RFlag *f, ut64 off, ut64 off_mask, ut64 to) {
 
 R_API bool r_flag_move(RFlag *f, ut64 at, ut64 to) {
 	R_RETURN_VAL_IF_FAIL (f, false);
-	RFlagItem *item = r_flag_get_i (f, at);
+	RFlagItem *item = r_flag_get_item (f, at);
 	if (item) {
 		r_flag_set (f, item->name, to, item->size);
 		return true;
diff --git a/libr/include/r_flag.h b/libr/include/r_flag.h
index 019016500f1a7..59f92793a2bc1 100644
--- a/libr/include/r_flag.h
+++ b/libr/include/r_flag.h
@@ -106,7 +106,7 @@ R_API void r_flag_free(RFlag *f);
 R_API void r_flag_list(RFlag *f, int rad, const char *pfx);
 R_API bool r_flag_exist_at(RFlag *f, const char *flag_prefix, ut16 fp_size, ut64 off);
 R_API RFlagItem *r_flag_get(RFlag *f, const char *name);
-R_API RFlagItem *r_flag_get_i(RFlag *f, ut64 off);
+R_API RFlagItem *r_flag_get_item(RFlag *f, ut64 off);
 R_API RFlagItem *r_flag_get_by_spaces(RFlag *f, bool prionospace, ut64 off, ...);
 R_API RFlagItem *r_flag_get_at(RFlag *f, ut64 off, bool closest);
 R_API RList *r_flag_all_list(RFlag *f, bool by_space);
diff --git a/test/unit/test_flags.c b/test/unit/test_flags.c
index 509c25c3b97f6..bd2aa6915a661 100644
--- a/test/unit/test_flags.c
+++ b/test/unit/test_flags.c
@@ -9,13 +9,13 @@ bool test_r_flag_get_set(void) {
 	mu_assert_notnull (flags, "r_flag_new () failed");
 
 	r_flag_set (flags, "foo", 1024, 50);
-	fi = r_flag_get_i (flags, 1024);
+	fi = r_flag_get_item (flags, 1024);
 	mu_assert_notnull (fi, "cannot find 'foo' flag at 1024");
 
 	r_flag_set (flags, "foo", 300LL, 0);
-	fi = r_flag_get_i (flags, 0);
+	fi = r_flag_get_item (flags, 0);
 	mu_assert_null (fi, "found a flag at 0 while there is none");
-	fi = r_flag_get_i (flags, 300LL);
+	fi = r_flag_get_item (flags, 300LL);
 	mu_assert_notnull (fi, "cannot find 'foo' flag at 300LL");
 
 	fi = r_flag_get (flags, "foo");