Add missing vector foreach macros to clang-format cfg (#4456)

* Add rz_vector_foreach to clang-format cfg
* Add other vector foreach macros

.clang-format

@@ -22,7 +22,7 @@ AlignConsecutiveMacros: true
 AlignTrailingComments: false
 AlignOperands: false
 Cpp11BracedListStyle: false
-ForEachMacros: ['rz_list_foreach', 'rz_list_foreach_safe', 'rz_pvector_foreach', 'rz_rbtree_foreach', 'rz_interval_tree_foreach', 'ls_foreach', 'rz_skiplist_foreach', 'graph_foreach_anode']
+ForEachMacros: ['rz_list_foreach', 'rz_list_foreach_safe', 'rz_vector_foreach', 'rz_vector_foreach_prev', 'rz_vector_enumerate', 'rz_pvector_foreach', 'rz_rbtree_foreach', 'rz_interval_tree_foreach', 'ls_foreach', 'rz_skiplist_foreach', 'graph_foreach_anode']
 SortIncludes: false
 RequiresClausePosition: SingleLine
 TypenameMacros: ['HT_', 'Ht_', 'HtName_']

librz/arch/asm.c

@@ -1431,7 +1431,7 @@ static bool overlaps_with_token(RZ_BORROW RzVector /*<RzAsmTokenString>*/ *toks,
 	rz_return_val_if_fail(toks, false);
 	size_t x, y; // Other tokens start/end
 	RzAsmToken *it;
-	rz_vector_foreach(toks, it) {
+	rz_vector_foreach (toks, it) {
 		x = it->start;
 		y = it->start + it->len - 1;
 		if (!(s > y || e < x)) { // s:e not outside of x:y
@@ -1496,7 +1496,7 @@ static void check_token_coverage(RzAsmTokenString *toks) {
 	RzAsmToken *cur, *prev = NULL;
 	int i = 0;
 	ut32 ci, cj, pi, pj; // Current and previous token indices.
-	rz_vector_foreach(toks->tokens, cur) {
+	rz_vector_foreach (toks->tokens, cur) {
 		if (i == cur->start) {
 			prev = cur;
 			i = cur->start + cur->len;

librz/arch/class.c

@@ -657,7 +657,7 @@ RZ_API bool rz_analysis_class_method_exists_by_addr(RzAnalysis *analysis, const
 		return false;
 	}
 	RzAnalysisMethod *meth;
-	rz_vector_foreach(vec, meth) {
+	rz_vector_foreach (vec, meth) {
 		if (meth->addr == addr) {
 			rz_vector_free(vec);
 			return true;
@@ -673,7 +673,7 @@ RZ_API RzAnalysisClassErr rz_analysis_class_method_get_by_addr(RzAnalysis *analy
 		return RZ_ANALYSIS_CLASS_ERR_OTHER;
 	}
 	RzAnalysisMethod *meth;
-	rz_vector_foreach(vec, meth) {
+	rz_vector_foreach (vec, meth) {
 		if (meth->addr == addr) {
 			method->name = rz_str_dup(meth->name);
 			method->addr = meth->addr;
@@ -1008,7 +1008,7 @@ RZ_API RzAnalysisClassErr rz_analysis_class_base_set(RzAnalysis *analysis, const
 	RzVector /*<RzAnalysisBaseClass>*/ *bases = rz_analysis_class_base_get_all(analysis, class_name);
 	if (bases) {
 		RzAnalysisBaseClass *existing_base;
-		rz_vector_foreach(bases, existing_base) {
+		rz_vector_foreach (bases, existing_base) {
 			if (!strcmp(existing_base->class_name, base->class_name)) {
 				free(base_class_name_sanitized);
 				rz_vector_free(bases);
@@ -1036,7 +1036,7 @@ static bool rz_analysis_class_base_delete_class_cb(void *user, const char *k, co
 	DeleteClassCtx *ctx = user;
 	RzVector *bases = rz_analysis_class_base_get_all(ctx->analysis, k);
 	RzAnalysisBaseClass *base;
-	rz_vector_foreach(bases, base) {
+	rz_vector_foreach (bases, base) {
 		if (base->class_name && strcmp(base->class_name, ctx->class_name) == 0) {
 			rz_analysis_class_base_delete(ctx->analysis, k, base->id);
 		}
@@ -1061,7 +1061,7 @@ static bool rz_analysis_class_base_rename_class_cb(void *user, const char *k, co
 	RenameClassCtx *ctx = user;
 	RzVector *bases = rz_analysis_class_base_get_all(ctx->analysis, k);
 	RzAnalysisBaseClass *base;
-	rz_vector_foreach(bases, base) {
+	rz_vector_foreach (bases, base) {
 		if (base->class_name && strcmp(base->class_name, ctx->class_name_old) == 0) {
 			rz_analysis_class_base_set_raw(ctx->analysis, k, base, ctx->class_name_new);
 		}
@@ -1170,7 +1170,7 @@ RZ_API RzAnalysisClassErr rz_analysis_class_vtable_set(RzAnalysis *analysis, con
 	RzVector /*<RzAnalysisVTable>*/ *vtables = rz_analysis_class_vtable_get_all(analysis, class_name);
 	if (vtables) {
 		RzAnalysisVTable *existing_vtable;
-		rz_vector_foreach(vtables, existing_vtable) {
+		rz_vector_foreach (vtables, existing_vtable) {
 			if (vtable->addr == existing_vtable->addr) {
 				rz_vector_free(vtables);
 				return RZ_ANALYSIS_CLASS_ERR_OTHER;
@@ -1307,7 +1307,7 @@ RZ_API RzGraph /*<RzGraphNodeInfo *>*/ *rz_analysis_class_get_inheritance_graph(
 		// create edges between node and it's parents
 		RzVector *bases = rz_analysis_class_base_get_all(analysis, name);
 		RzAnalysisBaseClass *base;
-		rz_vector_foreach(bases, base) {
+		rz_vector_foreach (bases, base) {
 			bool base_found = false;
 			RzGraphNode *base_node = ht_sp_find(hashmap, base->class_name, &base_found);
 			// If base isn't processed, do it now

librz/arch/dwarf_process.c

@@ -709,7 +709,7 @@ static RzBaseType *RzBaseType_from_die(DwContext *ctx, const RzBinDwarfDie *die)
 	}
 
 	RzBinDwarfAttr *attr = NULL;
-	rz_vector_foreach(&die->attrs, attr) {
+	rz_vector_foreach (&die->attrs, attr) {
 		switch (attr->at) {
 		case DW_AT_specification: {
 			RzBinDwarfDie *decl = ht_up_find(ctx->dw->info->die_by_offset, rz_bin_dwarf_attr_udata(attr), NULL);
@@ -796,7 +796,7 @@ static ut64 array_count_parse(DwContext *ctx, RzBinDwarfDie *die) {
 			continue;
 		}
 		RzBinDwarfAttr *attr;
-		rz_vector_foreach(&child_die->attrs, attr) {
+		rz_vector_foreach (&child_die->attrs, attr) {
 			switch (attr->at) {
 			case DW_AT_upper_bound:
 			case DW_AT_count:
@@ -1054,7 +1054,7 @@ static RzType *type_parse_from_abstract_origin(DwContext *ctx, ut64 offset, char
 	char *linkname = NULL;
 	RzType *type = NULL;
 	const RzBinDwarfAttr *attr;
-	rz_vector_foreach(&die->attrs, attr) {
+	rz_vector_foreach (&die->attrs, attr) {
 		switch (attr->at) {
 		case DW_AT_name:
 			name = at_string_escaped(attr, ctx);
@@ -1096,7 +1096,7 @@ static RzTypeStructMember *struct_member_parse(
 	ut64 offset = 0;
 	ut64 size = 0;
 	RzBinDwarfAttr *attr = NULL;
-	rz_vector_foreach(&die->attrs, attr) {
+	rz_vector_foreach (&die->attrs, attr) {
 		switch (attr->at) {
 		case DW_AT_name:
 			name = at_string_escaped(attr, ctx);
@@ -1260,7 +1260,7 @@ static bool enum_children_parse(
 
 static void function_apply_specification(DwContext *ctx, const RzBinDwarfDie *die, RzAnalysisDwarfFunction *fn) {
 	RzBinDwarfAttr *attr = NULL;
-	rz_vector_foreach(&die->attrs, attr) {
+	rz_vector_foreach (&die->attrs, attr) {
 		switch (attr->at) {
 		case DW_AT_name:
 			if (fn->name) {
@@ -1420,7 +1420,7 @@ static bool function_var_parse(
 
 	bool has_location = false;
 	const RzBinDwarfAttr *attr;
-	rz_vector_foreach(&var_die->attrs, attr) {
+	rz_vector_foreach (&var_die->attrs, attr) {
 		switch (attr->at) {
 		case DW_AT_name:
 			v->name = at_string_escaped(attr, ctx);
@@ -1544,7 +1544,7 @@ static bool function_from_die(
 	fcn->offset = die->offset;
 	RZ_LOG_DEBUG("DWARF function parsing [0x%" PFMT64x "]\n", die->offset);
 	RzBinDwarfAttr *attr;
-	rz_vector_foreach(&die->attrs, attr) {
+	rz_vector_foreach (&die->attrs, attr) {
 		switch (attr->at) {
 		case DW_AT_name:
 			fcn->name = at_string_escaped(attr, ctx);
@@ -1742,7 +1742,7 @@ RZ_API void rz_analysis_dwarf_preprocess_info(
 		.unit = NULL,
 	};
 	RzBinDwarfCompUnit *unit;
-	rz_vector_foreach(&dw->info->units, unit) {
+	rz_vector_foreach (&dw->info->units, unit) {
 		if (rz_vector_empty(&unit->dies)) {
 			continue;
 		}
@@ -1964,7 +1964,7 @@ static bool RzBinDwarfLocation_as_RzAnalysisVarStorage(
 			return false;
 		}
 		RzBinDwarfPiece *piece = NULL;
-		rz_vector_foreach(loc->composite, piece) {
+		rz_vector_foreach (loc->composite, piece) {
 			RzAnalysisVarStorage *sto = RZ_NEW0(RzAnalysisVarStorage);
 			if (!sto) {
 				goto clean_composite;
@@ -2031,7 +2031,7 @@ static bool dwarf_integrate_function(void *user, const ut64 k, const void *value
 	}
 
 	RzAnalysisDwarfVariable *dw_var;
-	rz_vector_foreach(&dw_fn->variables, dw_var) {
+	rz_vector_foreach (&dw_fn->variables, dw_var) {
 		RzAnalysisVar *var = RZ_NEW0(RzAnalysisVar);
 		rz_analysis_var_init(var);
 		if (!RzAnalysisDwarfVariable_as_RzAnalysisVar(analysis, fn, dw_var, var)) {

librz/arch/fcn.c

@@ -1493,7 +1493,7 @@ RZ_API bool rz_analysis_task_item_new(RZ_NONNULL RzAnalysis *analysis, RZ_NONNUL
 	rz_return_val_if_fail(analysis && tasks && fcn, false);
 	RzAnalysisTaskItem item = { fcn, block, sp, address };
 	RzAnalysisTaskItem *it;
-	rz_vector_foreach(tasks, it) {
+	rz_vector_foreach (tasks, it) {
 		if (item.start_address == it->start_address) {
 			return true;
 		}

librz/arch/function.c

@@ -237,7 +237,7 @@ RZ_API bool rz_analysis_function_relocate(RzAnalysisFunction *fcn, ut64 addr) {
 	rz_pvector_foreach (&fcn->vars, it) {
 		RzAnalysisVar *var = *it;
 		RzAnalysisVarAccess *acc;
-		rz_vector_foreach(&var->accesses, acc) {
+		rz_vector_foreach (&var->accesses, acc) {
 			acc->offset -= delta;
 		}
 	}

librz/arch/hint.c

@@ -160,7 +160,7 @@ static RzAnalysisAddrHintRecord *ensure_addr_hint_record(RzAnalysis *analysis, R
 		ht_up_insert(analysis->addr_hints, addr, records);
 	}
 	void *pos;
-	rz_vector_foreach(records, pos) {
+	rz_vector_foreach (records, pos) {
 		RzAnalysisAddrHintRecord *record = pos;
 		if (record->type == type) {
 			return record;
@@ -513,7 +513,7 @@ RZ_API RzAnalysisHint *rz_analysis_hint_get(RzAnalysis *a, ut64 addr) {
 	const RzVector *records = rz_analysis_addr_hints_at(a, addr);
 	if (records) {
 		RzAnalysisAddrHintRecord *record;
-		rz_vector_foreach(records, record) {
+		rz_vector_foreach (records, record) {
 			hint_merge(hint, record);
 		}
 	}

librz/arch/il/analysis_il.c

@@ -198,7 +198,7 @@ static void setup_vm_init_state(RzAnalysisILVM *vm, RZ_NULLABLE RzAnalysisILInit
 	}
 	if (is) {
 		RzAnalysisILInitStateVar *v;
-		rz_vector_foreach(&is->vars, v) {
+		rz_vector_foreach (&is->vars, v) {
 			rz_il_vm_set_global_var(vm->vm, v->name, rz_il_value_dup(v->val));
 		}
 	}

librz/arch/jmptbl.c

@@ -362,7 +362,7 @@ RZ_API bool rz_analysis_get_delta_jmptbl_info(RZ_NONNULL RzAnalysis *analysis, R
 	if (isValid) {
 		params->case_shift = 0;
 		void **it;
-		rz_vector_foreach_prev(&v, it) {
+		rz_vector_foreach_prev (&v, it) {
 			const ut64 op_off = *(ut64 *)it;
 			ut64 op_addr = lea_address + op_off;
 			rz_analysis_op_init(&tmp_aop);

librz/arch/rtti_itanium.c

@@ -766,7 +766,7 @@ static void recovery_apply_vtable(RVTableContext *context, const char *class_nam
 	rz_analysis_class_vtable_fini(&vtable);
 
 	RVTableMethodInfo *vmeth;
-	rz_vector_foreach(&vtable_info->methods, vmeth) {
+	rz_vector_foreach (&vtable_info->methods, vmeth) {
 		RzAnalysisMethod meth;
 		if (!rz_analysis_class_method_exists_by_addr(context->analysis, class_name, vmeth->addr)) {
 			meth.addr = vmeth->addr;
@@ -835,7 +835,7 @@ static void add_class_bases(RVTableContext *context, const class_type_info *cti)
 static void detect_constructor_destructor(RzAnalysis *analysis, class_type_info *cti) {
 	RzVector *vec = rz_analysis_class_method_get_all(analysis, cti->name);
 	RzAnalysisMethod *meth;
-	rz_vector_foreach(vec, meth) {
+	rz_vector_foreach (vec, meth) {
 		if (!rz_str_cmp(meth->real_name, cti->name, -1)) {
 			meth->method_type = RZ_ANALYSIS_CLASS_METHOD_CONSTRUCTOR;
 			rz_analysis_class_method_set(analysis, cti->name, meth);

librz/arch/rtti_msvc.c

@@ -825,7 +825,7 @@ static void recovery_apply_vtable(RVTableContext *context, const char *class_nam
 	rz_analysis_class_vtable_fini(&vtable);
 
 	RVTableMethodInfo *vmeth;
-	rz_vector_foreach(&vtable_info->methods, vmeth) {
+	rz_vector_foreach (&vtable_info->methods, vmeth) {
 		RzAnalysisMethod meth;
 		if (!rz_analysis_class_method_exists_by_addr(context->analysis, class_name, vmeth->addr)) {
 			meth.addr = vmeth->addr;
@@ -856,7 +856,7 @@ static const char *recovery_apply_type_descriptor(RRTTIMSVCAnalContext *context,
 
 static void recovery_apply_bases(RRTTIMSVCAnalContext *context, const char *class_name, RzVector /*<RecoveryBaseDescriptor>*/ *base_descs) {
 	RecoveryBaseDescriptor *base_desc;
-	rz_vector_foreach(base_descs, base_desc) {
+	rz_vector_foreach (base_descs, base_desc) {
 		RecoveryTypeDescriptor *base_td = base_desc->td;
 		if (!base_td->valid) {
 			RZ_LOG_WARN("Base td is invalid!\n");

librz/arch/serialize_analysis.c

@@ -450,7 +450,7 @@ RZ_API void rz_serialize_analysis_var_save(RZ_NONNULL PJ *j, RZ_NONNULL RzAnalys
 	if (!rz_vector_empty(&var->accesses)) {
 		pj_ka(j, "accs");
 		RzAnalysisVarAccess *acc;
-		rz_vector_foreach(&var->accesses, acc) {
+		rz_vector_foreach (&var->accesses, acc) {
 			pj_o(j);
 			pj_kn(j, "off", acc->offset);
 			switch (acc->type) {
@@ -479,7 +479,7 @@ RZ_API void rz_serialize_analysis_var_save(RZ_NONNULL PJ *j, RZ_NONNULL RzAnalys
 	if (!rz_vector_empty(&var->constraints)) {
 		pj_ka(j, "constrs");
 		RzTypeConstraint *constr;
-		rz_vector_foreach(&var->constraints, constr) {
+		rz_vector_foreach (&var->constraints, constr) {
 			pj_i(j, (int)constr->cond);
 			pj_n(j, constr->val);
 		}
@@ -730,11 +730,11 @@ RZ_API RZ_OWN RzAnalysisVar *rz_serialize_analysis_var_load(
 		ret->comment = strdup(comment);
 	}
 	RzAnalysisVarAccess *acc;
-	rz_vector_foreach(&accesses, acc) {
+	rz_vector_foreach (&accesses, acc) {
 		rz_analysis_var_set_access(ret, acc->reg, fcn->addr + acc->offset, acc->type, acc->reg_addend);
 	}
 	RzTypeConstraint *constr;
-	rz_vector_foreach(&constraints, constr) {
+	rz_vector_foreach (&constraints, constr) {
 		rz_analysis_var_add_constraint(ret, constr);
 	}
 
@@ -911,7 +911,7 @@ RZ_API void rz_serialize_analysis_global_var_save(RZ_NONNULL Sdb *db, RZ_NONNULL
 		if (!rz_vector_empty(&var->constraints)) {
 			pj_ka(j, "constrs");
 			RzTypeConstraint *constr;
-			rz_vector_foreach(&var->constraints, constr) {
+			rz_vector_foreach (&var->constraints, constr) {
 				pj_i(j, (int)constr->cond);
 				pj_n(j, constr->val);
 			}
@@ -1047,7 +1047,7 @@ static bool global_var_load_cb(void *user, const char *k, const char *v) {
 	rz_analysis_var_global_set_type(glob, vartype);
 
 	RzTypeConstraint *constr;
-	rz_vector_foreach(&constraints, constr) {
+	rz_vector_foreach (&constraints, constr) {
 		rz_analysis_var_global_add_constraint(glob, constr);
 	}
 	return rz_analysis_var_global_add(ctx->analysis, glob);
@@ -1826,7 +1826,7 @@ static bool hints_acc_store_cb(void *user, const ut64 addr, const void *v) {
 	}
 	if (h->addr_hints) {
 		RzAnalysisAddrHintRecord *record;
-		rz_vector_foreach(h->addr_hints, record) {
+		rz_vector_foreach (h->addr_hints, record) {
 			switch (record->type) {
 			case RZ_ANALYSIS_ADDR_HINT_TYPE_IMMBASE:
 				pj_ki(j, "immbase", record->immbase);

librz/arch/var.c

@@ -34,7 +34,7 @@ RZ_API int rz_analysis_var_storage_cmp(
 	case RZ_ANALYSIS_VAR_STORAGE_COMPOSITE: {
 		RzAnalysisVarStoragePiece *ap = NULL;
 		ut32 i = 0;
-		rz_vector_enumerate(a->composite, ap, i) {
+		rz_vector_enumerate (a->composite, ap, i) {
 			RzAnalysisVarStoragePiece *bp = rz_vector_index_ptr(b->composite, i);
 			int xcmp = ap->offset_in_bits - bp->offset_in_bits;
 			if (xcmp != 0) {
@@ -157,7 +157,7 @@ static void composite_dump_pj(
 	RZ_NONNULL RZ_BORROW const RzVector /*<RzAnalysisVarStoragePiece>*/ *composite) {
 	pj_a(pj);
 	RzAnalysisVarStoragePiece *piece = NULL;
-	rz_vector_foreach(composite, piece) {
+	rz_vector_foreach (composite, piece) {
 		pj_o(pj);
 		pj_kn(pj, "offset_in_bits", piece->offset_in_bits);
 		pj_kn(pj, "size_in_bits", piece->size_in_bits);
@@ -217,7 +217,7 @@ RZ_API void rz_analysis_var_storage_poolify(
 			return;
 		}
 		RzAnalysisVarStoragePiece *piece = NULL;
-		rz_vector_foreach(stor->composite, piece) {
+		rz_vector_foreach (stor->composite, piece) {
 			rz_analysis_var_storage_poolify(analysis, piece->storage);
 		}
 	}
@@ -827,7 +827,7 @@ RZ_DEPRECATE RZ_API RzAnalysisVar *rz_analysis_get_used_function_var(RzAnalysis
 RZ_API RzAnalysisVar *rz_analysis_var_get_dst_var(RzAnalysisVar *var) {
 	rz_return_val_if_fail(var, NULL);
 	RzAnalysisVarAccess *acc;
-	rz_vector_foreach(&var->accesses, acc) {
+	rz_vector_foreach (&var->accesses, acc) {
 		if (!(acc->type & RZ_ANALYSIS_VAR_ACCESS_TYPE_READ)) {
 			continue;
 		}
@@ -905,7 +905,7 @@ RZ_API void rz_analysis_var_clear_accesses(RzAnalysisVar *var) {
 	if (fcn->inst_vars) {
 		// remove all inverse references to the var's accesses
 		RzAnalysisVarAccess *acc;
-		rz_vector_foreach(&var->accesses, acc) {
+		rz_vector_foreach (&var->accesses, acc) {
 			RzPVector *inst_accesses = ht_up_find(fcn->inst_vars, (ut64)acc->offset, NULL);
 			if (!inst_accesses) {
 				continue;