Fix annotation inconsistencies

librz/analysis/analysis.c

@@ -389,7 +389,7 @@ RZ_API void rz_analysis_trace_bb(RzAnalysis *analysis, ut64 addr) {
 	}
 }
 
-RZ_API RzList *rz_analysis_get_fcns(RzAnalysis *analysis) {
+RZ_API RzList /*<RzAnalysisFunction *>*/ *rz_analysis_get_fcns(RzAnalysis *analysis) {
 	// avoid received to free this thing
 	analysis->fcns->free = NULL;
 	return analysis->fcns;
@@ -666,7 +666,7 @@ RZ_API void rz_analysis_bind(RzAnalysis *analysis, RzAnalysisBind *b) {
 	}
 }
 
-RZ_API RzList *rz_analysis_preludes(RzAnalysis *analysis) {
+RZ_API RzList /*<RzSearchKeyword *>*/ *rz_analysis_preludes(RzAnalysis *analysis) {
 	if (analysis->cur && analysis->cur->preludes) {
 		return analysis->cur->preludes(analysis);
 	}

librz/analysis/block.c

@@ -130,7 +130,7 @@ static bool block_list_cb(RzAnalysisBlock *block, void *user) {
 	return true;
 }
 
-RZ_API RzList *rz_analysis_get_blocks_in(RzAnalysis *analysis, ut64 addr) {
+RZ_API RzList /*<RzAnalysisBlock *>*/ *rz_analysis_get_blocks_in(RzAnalysis *analysis, ut64 addr) {
 	RzList *list = rz_list_newf((RzListFree)rz_analysis_block_unref);
 	if (list) {
 		rz_analysis_blocks_foreach_in(analysis, addr, block_list_cb, list);
@@ -162,7 +162,7 @@ RZ_API void rz_analysis_blocks_foreach_intersect(RzAnalysis *analysis, ut64 addr
 	all_intersect(unwrap(analysis->bb_tree), addr, size, cb, user);
 }
 
-RZ_API RzList *rz_analysis_get_blocks_intersect(RzAnalysis *analysis, ut64 addr, ut64 size) {
+RZ_API RzList /*<RzAnalysisBlock *>*/ *rz_analysis_get_blocks_intersect(RzAnalysis *analysis, ut64 addr, ut64 size) {
 	RzList *list = rz_list_newf((RzListFree)rz_analysis_block_unref);
 	if (!list) {
 		return NULL;
@@ -564,7 +564,7 @@ static bool recurse_list_cb(RzAnalysisBlock *block, void *user) {
 	return true;
 }
 
-RZ_API RzList *rz_analysis_block_recurse_list(RzAnalysisBlock *block) {
+RZ_API RzList /*<RzAnalysisBlock *>*/ *rz_analysis_block_recurse_list(RzAnalysisBlock *block) {
 	RzList *ret = rz_list_newf((RzListFree)rz_analysis_block_unref);
 	if (ret) {
 		rz_analysis_block_recurse(block, recurse_list_cb, ret);

librz/analysis/class.c

@@ -1258,7 +1258,7 @@ RZ_API RzAnalysisClassErr rz_analysis_class_vtable_delete(RzAnalysis *analysis,
  * @param analysis
  * @return RzGraph* NULL if failure
  */
-RZ_API RzGraph *rz_analysis_class_get_inheritance_graph(RzAnalysis *analysis) {
+RZ_API RzGraph /*<RzGraphNodeInfo *>*/ *rz_analysis_class_get_inheritance_graph(RzAnalysis *analysis) {
 	rz_return_val_if_fail(analysis, NULL);
 	RzGraph *class_graph = rz_graph_new();
 	if (!class_graph) {

librz/analysis/diff.c

@@ -173,7 +173,7 @@ RZ_API bool rz_analysis_diff_bb(RzAnalysis *analysis, RzAnalysisFunction *fcn, R
 	return true;
 }
 
-RZ_API int rz_analysis_diff_fcn(RzAnalysis *analysis, RzList *fcns1, RzList *fcns2) {
+RZ_API int rz_analysis_diff_fcn(RzAnalysis *analysis, RzList /*<RzAnalysisFunction *>*/ *fcns1, RzList /*<RzAnalysisFunction *>*/ *fcns2) {
 	RzAnalysisFunction *fcn, *fcn2, *mfcn, *mfcn2;
 	RzListIter *iter, *iter2;
 	double t, ot, sizes_div;

librz/analysis/dwarf_process.c

@@ -1217,7 +1217,7 @@ static VariableLocation *parse_dwarf_location(Context *ctx, const RzBinDwarfAttr
 	return location;
 }
 
-static st32 parse_function_args_and_vars(Context *ctx, ut64 idx, RzStrBuf *args, RzList /*<Variable*>*/ *variables) {
+static st32 parse_function_args_and_vars(Context *ctx, ut64 idx, RzStrBuf *args, RzList /*<Variable *>*/ *variables) {
 	const RzBinDwarfDie *die = &ctx->all_dies[idx++];
 
 	if (die->has_children) {
@@ -1305,7 +1305,7 @@ static st32 parse_function_args_and_vars(Context *ctx, ut64 idx, RzStrBuf *args,
 	return 0;
 }
 
-static void sdb_save_dwarf_function(Function *dwarf_fcn, RzList /*<Variable*>*/ *variables, Sdb *sdb) {
+static void sdb_save_dwarf_function(Function *dwarf_fcn, RzList /*<Variable *>*/ *variables, Sdb *sdb) {
 	char *sname = rz_str_sanitize_sdb_key(dwarf_fcn->name);
 	sdb_set(sdb, sname, "fcn", 0);
 

librz/analysis/fcn.c

@@ -1485,7 +1485,7 @@ static RzAnalysisBBEndCause run_basic_block_analysis(RzAnalysisTaskItem *item, R
  * \param block Pointer to RzAnalysisBlock in which analysis will be performed on. If null, analysis will take care of block creation.
  * \param address Address where analysis will start from
  */
-RZ_API bool rz_analysis_task_item_new(RZ_NONNULL RzAnalysis *analysis, RZ_NONNULL RzVector *tasks, RZ_NONNULL RzAnalysisFunction *fcn, RZ_NULLABLE RzAnalysisBlock *block, ut64 address) {
+RZ_API bool rz_analysis_task_item_new(RZ_NONNULL RzAnalysis *analysis, RZ_NONNULL RzVector /*<RzAnalysisTaskItem>*/ *tasks, RZ_NONNULL RzAnalysisFunction *fcn, RZ_NULLABLE RzAnalysisBlock *block, ut64 address) {
 	rz_return_val_if_fail(analysis && tasks && fcn, false);
 	RzAnalysisTaskItem item = { fcn, block, fcn->stack, address };
 	RzAnalysisTaskItem *it;
@@ -1506,7 +1506,7 @@ RZ_API bool rz_analysis_task_item_new(RZ_NONNULL RzAnalysis *analysis, RZ_NONNUL
  *
  * \param tasks Pointer to RzVector of RzAnalysisTaskItem to be performed analysis on.
  */
-RZ_API int rz_analysis_run_tasks(RZ_NONNULL RzVector *tasks) {
+RZ_API int rz_analysis_run_tasks(RZ_NONNULL RzVector /*<RzAnalysisTaskItem>*/ *tasks) {
 	rz_return_val_if_fail(tasks, RZ_ANALYSIS_RET_ERROR);
 	int ret = RZ_ANALYSIS_RET_ERROR;
 	while (!rz_vector_empty(tasks)) {
@@ -1684,7 +1684,7 @@ RZ_API int rz_analysis_fcn_del(RzAnalysis *a, ut64 addr) {
 	return true;
 }
 
-RZ_API RzAnalysisFunction *rz_analysis_get_fcn_in(RzAnalysis *analysis, ut64 addr, int type) {
+RZ_DEPRECATE RZ_API RzAnalysisFunction *rz_analysis_get_fcn_in(RzAnalysis *analysis, ut64 addr, int type) {
 	RzList *list = rz_analysis_get_functions_in(analysis, addr);
 	RzAnalysisFunction *ret = NULL;
 	if (list && !rz_list_empty(list)) {
@@ -1705,7 +1705,7 @@ RZ_API RzAnalysisFunction *rz_analysis_get_fcn_in(RzAnalysis *analysis, ut64 add
 	return ret;
 }
 
-RZ_API RzAnalysisFunction *rz_analysis_get_fcn_in_bounds(RzAnalysis *analysis, ut64 addr, int type) {
+RZ_DEPRECATE RZ_API RzAnalysisFunction *rz_analysis_get_fcn_in_bounds(RzAnalysis *analysis, ut64 addr, int type) {
 	RzAnalysisFunction *fcn, *ret = NULL;
 	RzListIter *iter;
 	if (type == RZ_ANALYSIS_FCN_TYPE_ROOT) {
@@ -2478,7 +2478,7 @@ RZ_API size_t rz_analysis_function_arg_count(RzAnalysis *a, RzAnalysisFunction *
  * \param a RzAnalysis instance
  * \param f Function
  */
-RZ_API RZ_OWN RzPVector *rz_analysis_function_args(RzAnalysis *a, RzAnalysisFunction *fcn) {
+RZ_API RZ_OWN RzPVector /*<RzAnalysisVar *>*/ *rz_analysis_function_args(RzAnalysis *a, RzAnalysisFunction *fcn) {
 	if (!a || !fcn) {
 		return NULL;
 	}

librz/analysis/function.c

@@ -17,7 +17,7 @@ static bool get_functions_block_cb(RzAnalysisBlock *block, void *user) {
 	return true;
 }
 
-RZ_API RzList *rz_analysis_get_functions_in(RzAnalysis *analysis, ut64 addr) {
+RZ_API RzList /*<RzAnalysisFunction *>*/ *rz_analysis_get_functions_in(RzAnalysis *analysis, ut64 addr) {
 	RzList *list = rz_list_new();
 	if (!list) {
 		return NULL;
@@ -375,7 +375,7 @@ RZ_API bool rz_analysis_function_was_modified(RzAnalysisFunction *fcn) {
 	return false;
 }
 
-RZ_API RZ_BORROW RzList *rz_analysis_function_list(RzAnalysis *analysis) {
+RZ_API RZ_BORROW RzList /*<RzAnalysisFunction *>*/ *rz_analysis_function_list(RzAnalysis *analysis) {
 	rz_return_val_if_fail(analysis, NULL);
 	return analysis->fcns;
 }

librz/analysis/hint.c

@@ -276,7 +276,7 @@ RZ_API void rz_analysis_hint_set_val(RzAnalysis *a, ut64 addr, ut64 v) {
 	SET_HINT(RZ_ANALYSIS_ADDR_HINT_TYPE_VAL, r->val = v;);
 }
 
-RZ_API void rz_analysis_hint_set_arch(RzAnalysis *a, ut64 addr, const char *arch) {
+RZ_API void rz_analysis_hint_set_arch(RzAnalysis *a, ut64 addr, RZ_NULLABLE const char *arch) {
 	RzAnalysisArchHintRecord *record = (RzAnalysisArchHintRecord *)ensure_ranged_hint_record(&a->arch_hints, addr, sizeof(RzAnalysisArchHintRecord));
 	if (!record) {
 		return;

librz/analysis/meta.c

@@ -220,11 +220,11 @@ RZ_API RzPVector /*<RzIntervalNode<RMetaItem> *>*/ *rz_meta_get_all_at(RzAnalysi
 	return collect_nodes_at(a, RZ_META_TYPE_ANY, rz_spaces_current(&a->meta_spaces), at);
 }
 
-RZ_API RzPVector *rz_meta_get_all_in(RzAnalysis *a, ut64 at, RzAnalysisMetaType type) {
+RZ_API RzPVector /*<RzIntervalNode<RMetaItem> *>*/ *rz_meta_get_all_in(RzAnalysis *a, ut64 at, RzAnalysisMetaType type) {
 	return collect_nodes_in(a, type, rz_spaces_current(&a->meta_spaces), at);
 }
 
-RZ_API RzPVector *rz_meta_get_all_intersect(RzAnalysis *a, ut64 start, ut64 size, RzAnalysisMetaType type) {
+RZ_API RzPVector /*<RzIntervalNode<RMetaItem> *>*/ *rz_meta_get_all_intersect(RzAnalysis *a, ut64 start, ut64 size, RzAnalysisMetaType type) {
 	rz_return_val_if_fail(size, NULL);
 	ut64 end = start + size - 1;
 	if (end < start) {

librz/analysis/op.c

@@ -12,7 +12,7 @@ RZ_API RzAnalysisOp *rz_analysis_op_new(void) {
 	return op;
 }
 
-RZ_API RzList *rz_analysis_op_list_new(void) {
+RZ_API RzList /*<RzAnalysisOp *>*/ *rz_analysis_op_list_new(void) {
 	RzList *list = rz_list_new();
 	if (list) {
 		list->free = &rz_analysis_op_free;

librz/analysis/reflines.c

@@ -79,7 +79,7 @@ RZ_API void rz_analysis_reflines_free(RzAnalysisRefline *rl) {
  * nlines - max number of lines of code to consider
  * linesout - true if you want to display lines that go outside of the scope [addr;addr+len)
  * linescall - true if you want to display call lines */
-RZ_API RzList *rz_analysis_reflines_get(RzAnalysis *analysis, ut64 addr, const ut8 *buf, ut64 len, int nlines, int linesout, int linescall) {
+RZ_API RzList /*<RzAnalysisRefline *>*/ *rz_analysis_reflines_get(RzAnalysis *analysis, ut64 addr, const ut8 *buf, ut64 len, int nlines, int linesout, int linescall) {
 	RzList *list, *sten;
 	RzListIter *iter;
 	RzAnalysisOp op;

librz/analysis/rtti_itanium.c

@@ -857,7 +857,7 @@ static void detect_constructor_destructor(RzAnalysis *analysis, class_type_info
 	rz_vector_free(vec);
 }
 
-RZ_API void rz_analysis_rtti_itanium_recover_all(RVTableContext *context, RzList *vtables) {
+RZ_API void rz_analysis_rtti_itanium_recover_all(RVTableContext *context, RzList /*<RVTableInfo *>*/ *vtables) {
 	RzList /*<class_type_info>*/ *rtti_list = rz_list_new();
 	rtti_list->free = rtti_itanium_type_info_free;
 	// to escape multiple same infos from multiple inheritance

librz/analysis/typelink.c

@@ -93,7 +93,7 @@ static bool type_collect_cb(void *user, ut64 k, const void *v) {
  *
  * \param analysis RzAnalysis instance
  */
-RZ_API RZ_OWN RzList /* RzType */ *rz_analysis_type_links(RzAnalysis *analysis) {
+RZ_API RZ_OWN RzList /*<RzType *>*/ *rz_analysis_type_links(RzAnalysis *analysis) {
 	rz_return_val_if_fail(analysis, NULL);
 	RzList *types = rz_list_new();
 	ht_up_foreach(analysis->type_links, type_collect_cb, types);
@@ -139,7 +139,7 @@ static bool type_paths_collect_by_offset_cb(void *user, ut64 k, const void *v) {
  * \param analysis RzAnalysis instance
  * \param offset The offset of the member to match against
  */
-RZ_API RZ_OWN RzList /* RzTypePath */ *rz_analysis_type_links_by_offset(RzAnalysis *analysis, ut64 offset) {
+RZ_API RZ_OWN RzList /*<RzTypePath *>*/ *rz_analysis_type_links_by_offset(RzAnalysis *analysis, ut64 offset) {
 	rz_return_val_if_fail(analysis, NULL);
 	if (offset == UT64_MAX) {
 		return NULL;
@@ -198,7 +198,7 @@ static bool type_paths_collect_by_address_cb(void *user, ut64 k, const void *v)
  * \param analysis RzAnalysis instance
  * \param addr The address to check against possible matches
  */
-RZ_API RZ_OWN RzList /* RzTypePath */ *rz_analysis_type_paths_by_address(RzAnalysis *analysis, ut64 addr) {
+RZ_API RZ_OWN RzList /*<RzTypePath *>*/ *rz_analysis_type_paths_by_address(RzAnalysis *analysis, ut64 addr) {
 	rz_return_val_if_fail(analysis, NULL);
 	if (addr == UT64_MAX) {
 		return NULL;

librz/analysis/var.c

@@ -108,7 +108,7 @@ RZ_API void rz_analysis_var_resolve_overlaps(RzAnalysisVar *var) {
 	rz_pvector_free(cloned_vars);
 }
 
-RZ_API RzAnalysisVar *rz_analysis_function_set_var(RzAnalysisFunction *fcn, int delta, char kind, RZ_BORROW RZ_NULLABLE const RzType *type, int size, bool isarg, RZ_NONNULL const char *name) {
+RZ_API RZ_BORROW RzAnalysisVar *rz_analysis_function_set_var(RzAnalysisFunction *fcn, int delta, char kind, RZ_BORROW RZ_NULLABLE const RzType *type, int size, bool isarg, RZ_NONNULL const char *name) {
 	rz_return_val_if_fail(fcn && name, NULL);
 	RzAnalysisVar *existing = rz_analysis_function_get_var_byname(fcn, name);
 	if (existing && (existing->kind != kind || existing->delta != delta)) {
@@ -256,7 +256,7 @@ RZ_API RZ_BORROW RzAnalysisVar *rz_analysis_function_get_var_byname(RzAnalysisFu
 	return NULL;
 }
 
-RZ_API RzAnalysisVar *rz_analysis_function_get_var(RzAnalysisFunction *fcn, char kind, int delta) {
+RZ_API RZ_BORROW RzAnalysisVar *rz_analysis_function_get_var(RzAnalysisFunction *fcn, char kind, int delta) {
 	void **it;
 	rz_pvector_foreach (&fcn->vars, it) {
 		RzAnalysisVar *var = *it;
@@ -390,12 +390,12 @@ RZ_API int rz_analysis_var_get_argnum(RzAnalysisVar *var) {
 	return -1;
 }
 
-RZ_API RZ_BORROW RzPVector *rz_analysis_function_get_vars_used_at(RzAnalysisFunction *fcn, ut64 op_addr) {
+RZ_API RZ_BORROW RzPVector /*<RzAnalysisVar *>*/ *rz_analysis_function_get_vars_used_at(RzAnalysisFunction *fcn, ut64 op_addr) {
 	rz_return_val_if_fail(fcn, NULL);
 	return ht_up_find(fcn->inst_vars, (st64)op_addr - (st64)fcn->addr, NULL);
 }
 
-RZ_API RZ_DEPRECATE RzAnalysisVar *rz_analysis_get_used_function_var(RzAnalysis *analysis, ut64 addr) {
+RZ_DEPRECATE RZ_API RzAnalysisVar *rz_analysis_get_used_function_var(RzAnalysis *analysis, ut64 addr) {
 	RzList *fcns = rz_analysis_get_functions_in(analysis, addr);
 	if (!fcns) {
 		return NULL;
@@ -1132,7 +1132,7 @@ static RzList *var_generate_list(RzAnalysis *a, RzAnalysisFunction *fcn, int kin
 	return list;
 }
 
-RZ_API RzList *rz_analysis_var_all_list(RzAnalysis *analysis, RzAnalysisFunction *fcn) {
+RZ_DEPRECATE RZ_API RzList /*<RzAnalysisVar *>*/ *rz_analysis_var_all_list(RzAnalysis *analysis, RzAnalysisFunction *fcn) {
 	// rz_analysis_var_list if there are not vars with that kind returns a list with
 	// zero element.. which is an unnecessary loss of cpu time
 	RzList *list = rz_list_new();
@@ -1151,7 +1151,7 @@ RZ_API RzList *rz_analysis_var_all_list(RzAnalysis *analysis, RzAnalysisFunction
 	return list;
 }
 
-RZ_API RzList *rz_analysis_var_list(RzAnalysis *a, RzAnalysisFunction *fcn, int kind) {
+RZ_API RzList /*<RzAnalysisVar *>*/ *rz_analysis_var_list(RzAnalysis *a, RzAnalysisFunction *fcn, int kind) {
 	return var_generate_list(a, fcn, kind);
 }
 
@@ -1163,7 +1163,7 @@ static void var_field_free(RzAnalysisVarField *field) {
 	free(field);
 }
 
-RZ_API RzList *rz_analysis_function_get_var_fields(RzAnalysisFunction *fcn, int kind) {
+RZ_DEPRECATE RZ_API RzList /*<RzAnalysisVarField *>*/ *rz_analysis_function_get_var_fields(RzAnalysisFunction *fcn, int kind) {
 	if (!fcn) {
 		return NULL;
 	}

librz/analysis/var_global.c

@@ -256,7 +256,7 @@ static bool global_var_collect_cb(void *user, const void *k, const void *v) {
  * \param analysis RzAnalysis
  * \return RzList *
  */
-RZ_API RZ_OWN RzList *rz_analysis_var_global_get_all(RzAnalysis *analysis) {
+RZ_API RZ_OWN RzList /*<RzAnalysisVarGlobal *>*/ *rz_analysis_var_global_get_all(RzAnalysis *analysis) {
 	rz_return_val_if_fail(analysis, NULL);
 	RzList *globals = rz_list_new();
 	if (!globals) {

librz/analysis/xrefs.c

@@ -35,7 +35,7 @@ static void rz_analysis_xref_free(RzAnalysisXRef *xref) {
 	free(xref);
 }
 
-RZ_API RzList *rz_analysis_xref_list_new() {
+RZ_API RzList /*<RzAnalysisXRef *>*/ *rz_analysis_xref_list_new() {
 	return rz_list_newf((RzListFree)free);
 }
 
@@ -170,7 +170,7 @@ RZ_API bool rz_analysis_xref_del(RzAnalysis *analysis, ut64 from, ut64 to) {
 	return res;
 }
 
-RZ_API RzList *rz_analysis_xrefs_get_to(RzAnalysis *analysis, ut64 addr) {
+RZ_API RzList /*<RzAnalysisXRef *>*/ *rz_analysis_xrefs_get_to(RzAnalysis *analysis, ut64 addr) {
 	RzList *list = rz_analysis_xref_list_new();
 	if (!list) {
 		return NULL;
@@ -184,7 +184,7 @@ RZ_API RzList *rz_analysis_xrefs_get_to(RzAnalysis *analysis, ut64 addr) {
 	return list;
 }
 
-RZ_API RzList *rz_analysis_xrefs_get_from(RzAnalysis *analysis, ut64 addr) {
+RZ_API RzList /*<RzAnalysisXRef *>*/ *rz_analysis_xrefs_get_from(RzAnalysis *analysis, ut64 addr) {
 	RzList *list = rz_analysis_xref_list_new();
 	if (!list) {
 		return NULL;
@@ -203,7 +203,7 @@ RZ_API RzList *rz_analysis_xrefs_get_from(RzAnalysis *analysis, ut64 addr) {
  * \param analysis RzAnalysis instance
  * \return RzList <RzAnalysisXRef *>
  */
-RZ_API RZ_OWN RzList *rz_analysis_xrefs_list(RzAnalysis *analysis) {
+RZ_API RZ_OWN RzList /*<RzAnalysisXRef *>*/ *rz_analysis_xrefs_list(RzAnalysis *analysis) {
 	rz_return_val_if_fail(analysis, NULL);
 	RzList *list = rz_analysis_xref_list_new();
 	if (list) {
@@ -294,12 +294,12 @@ static RzList *fcn_get_refs(RzAnalysisFunction *fcn, HtUP *ht) {
 	return list;
 }
 
-RZ_API RzList *rz_analysis_function_get_xrefs_from(RzAnalysisFunction *fcn) {
+RZ_API RzList /*<RzAnalysisXRef *>*/ *rz_analysis_function_get_xrefs_from(RzAnalysisFunction *fcn) {
 	rz_return_val_if_fail(fcn, NULL);
 	return fcn_get_refs(fcn, fcn->analysis->ht_xrefs_from);
 }
 
-RZ_API RzList *rz_analysis_function_get_xrefs_to(RzAnalysisFunction *fcn) {
+RZ_API RzList /*<RzAnalysisXRef *>*/ *rz_analysis_function_get_xrefs_to(RzAnalysisFunction *fcn) {
 	rz_return_val_if_fail(fcn, NULL);
 	return fcn_get_refs(fcn, fcn->analysis->ht_xrefs_to);
 }

librz/asm/arch/sh/disassembler.h

@@ -250,6 +250,6 @@ typedef struct sh_opcode_t {
 RZ_IPI RZ_OWN SHOp *sh_disassembler(ut16 opcode);
 
 RZ_IPI RZ_OWN char *sh_op_param_to_str(SHParam param, SHScaling scaling, ut64 pc);
-RZ_IPI RZ_OWN char *sh_op_to_str(const SHOp *op, ut64 pc);
+RZ_IPI RZ_OWN char *sh_op_to_str(RZ_NONNULL const SHOp *op, ut64 pc);
 
 #endif /* RZ_SH_DISASSEMBLER_H */

librz/asm/asm.c

@@ -1399,7 +1399,7 @@ static void add_token(RZ_OUT RzAsmTokenString *toks, const size_t i, const size_
  * \return true Overlaps with token from token vector.
  * \return false Does not overap with other token.
  */
-static bool overlaps_with_token(RZ_BORROW RzVector /* RzAsmTokenString */ *toks, const size_t s, const size_t e) {
+static bool overlaps_with_token(RZ_BORROW RzVector /*<RzAsmTokenString>*/ *toks, const size_t s, const size_t e) {
 	rz_return_val_if_fail(toks, false);
 	size_t x, y; // Other tokens start/end
 	RzAsmToken *it;
@@ -1469,7 +1469,7 @@ static void check_token_coverage(RzAsmTokenString *toks) {
  * \param patterns RzList<RzAsmTokenPattern> with the regex patterns describing each token type.
  * \return RzAsmTokenString* The tokens.
  */
-RZ_API RZ_OWN RzAsmTokenString *rz_asm_tokenize_asm_regex(RZ_BORROW RzStrBuf *asm_str, RzPVector /* RzAsmTokenPattern* */ *patterns) {
+RZ_API RZ_OWN RzAsmTokenString *rz_asm_tokenize_asm_regex(RZ_BORROW RzStrBuf *asm_str, RzPVector /*<RzAsmTokenPattern *>*/ *patterns) {
 	rz_return_val_if_fail(asm_str && patterns, NULL);
 
 	const char *str = rz_strbuf_get(asm_str);