diff --git a/.clang-format b/.clang-format index 0f55ff7bb65..890213d01bd 100644 --- a/.clang-format +++ b/.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_'] \ No newline at end of file diff --git a/librz/arch/asm.c b/librz/arch/asm.c index e02184063d9..7b24d92b189 100644 --- a/librz/arch/asm.c +++ b/librz/arch/asm.c @@ -1431,7 +1431,7 @@ static bool overlaps_with_token(RZ_BORROW RzVector /**/ *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; diff --git a/librz/arch/class.c b/librz/arch/class.c index b74980713f4..c9c7322946a 100644 --- a/librz/arch/class.c +++ b/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 /**/ *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 /**/ *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 /**/ *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 diff --git a/librz/arch/dwarf_process.c b/librz/arch/dwarf_process.c index d12bcac242a..d7104a109fe 100644 --- a/librz/arch/dwarf_process.c +++ b/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)) { diff --git a/librz/arch/fcn.c b/librz/arch/fcn.c index 7a0a21ace04..544c9ee9cb9 100644 --- a/librz/arch/fcn.c +++ b/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; } diff --git a/librz/arch/function.c b/librz/arch/function.c index 006ee5774ec..d298c93bddd 100644 --- a/librz/arch/function.c +++ b/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; } } diff --git a/librz/arch/hint.c b/librz/arch/hint.c index 06f7b31cdaa..878ca852de0 100644 --- a/librz/arch/hint.c +++ b/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); } } diff --git a/librz/arch/il/analysis_il.c b/librz/arch/il/analysis_il.c index efb5040aa69..6b33d25ff59 100644 --- a/librz/arch/il/analysis_il.c +++ b/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)); } } diff --git a/librz/arch/jmptbl.c b/librz/arch/jmptbl.c index 85cfe163d39..f1e43cd8583 100644 --- a/librz/arch/jmptbl.c +++ b/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); diff --git a/librz/arch/rtti_itanium.c b/librz/arch/rtti_itanium.c index 11e3ab8da63..6165deed34c 100644 --- a/librz/arch/rtti_itanium.c +++ b/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); diff --git a/librz/arch/rtti_msvc.c b/librz/arch/rtti_msvc.c index 35ccb7079f2..5f48dbc40ce 100644 --- a/librz/arch/rtti_msvc.c +++ b/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 /**/ *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"); diff --git a/librz/arch/serialize_analysis.c b/librz/arch/serialize_analysis.c index fccae0721f4..9f0b0343b0d 100644 --- a/librz/arch/serialize_analysis.c +++ b/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); diff --git a/librz/arch/var.c b/librz/arch/var.c index ae3defb4e4b..2f94664908a 100644 --- a/librz/arch/var.c +++ b/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 /**/ *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; diff --git a/librz/arch/vtable.c b/librz/arch/vtable.c index 60a4877d4eb..c768caea74d 100644 --- a/librz/arch/vtable.c +++ b/librz/arch/vtable.c @@ -310,7 +310,7 @@ RZ_API void rz_analysis_list_vtables(RzAnalysis *analysis, RzOutputMode mode) { pj_o(pj); pj_kN(pj, "offset", table->saddr); pj_ka(pj, "methods"); - rz_vector_foreach(&table->methods, curMethod) { + rz_vector_foreach (&table->methods, curMethod) { RzAnalysisFunction *fcn = rz_analysis_get_fcn_in(analysis, curMethod->addr, 0); const char *const name = fcn ? fcn->name : NULL; pj_o(pj); @@ -330,7 +330,7 @@ RZ_API void rz_analysis_list_vtables(RzAnalysis *analysis, RzOutputMode mode) { table->saddr, rz_analysis_vtable_info_get_size(&context, table), table->saddr); - rz_vector_foreach(&table->methods, curMethod) { + rz_vector_foreach (&table->methods, curMethod) { rz_cons_printf("Cd %d @ 0x%08" PFMT64x "\n", context.word_size, table->saddr + curMethod->vtable_offset); RzAnalysisFunction *fcn = rz_analysis_get_fcn_in(analysis, curMethod->addr, 0); const char *const name = fcn ? fcn->name : NULL; @@ -345,7 +345,7 @@ RZ_API void rz_analysis_list_vtables(RzAnalysis *analysis, RzOutputMode mode) { rz_list_foreach (vtables, vtableIter, table) { ut64 vtableStartAddress = table->saddr; rz_cons_printf("\nVtable Found at 0x%08" PFMT64x "\n", vtableStartAddress); - rz_vector_foreach(&table->methods, curMethod) { + rz_vector_foreach (&table->methods, curMethod) { RzAnalysisFunction *fcn = rz_analysis_get_fcn_in(analysis, curMethod->addr, 0); const char *const name = fcn ? fcn->name : NULL; rz_cons_printf("0x%08" PFMT64x " : %s\n", vtableStartAddress, name ? name : noMethodName); diff --git a/librz/bin/dwarf/abbrev.c b/librz/bin/dwarf/abbrev.c index 03ed28b7c81..8990349be36 100644 --- a/librz/bin/dwarf/abbrev.c +++ b/librz/bin/dwarf/abbrev.c @@ -222,7 +222,7 @@ static void abbrev_decl_dump( rz_strbuf_appendf(sb, "(0x%" PFMT64x ")\n", decl->offset); RzBinDwarfAttrSpec *def = NULL; - rz_vector_foreach(&decl->defs, def) { + rz_vector_foreach (&decl->defs, def) { rz_strbuf_appendf(sb, "\t%s\t%s\n", rz_bin_dwarf_attr(def->at), rz_bin_dwarf_form(def->form)); } @@ -240,7 +240,7 @@ static bool cb_abbrev_table_dump(void *user, ut64 k, const void *v) { } void *itdecl; - rz_vector_foreach(&table->abbrevs, itdecl) { + rz_vector_foreach (&table->abbrevs, itdecl) { if (!itdecl) { continue; } diff --git a/librz/bin/dwarf/line.c b/librz/bin/dwarf/line.c index d83c313c611..9b535594af5 100644 --- a/librz/bin/dwarf/line.c +++ b/librz/bin/dwarf/line.c @@ -92,7 +92,7 @@ static const char *directory_parse_v5(DWLineContext *ctx, RzBinDwarfLineUnitHdr RzBinEndianReader *R = ctx->line->R; const char *path_name = NULL; RzBinDwarfFileEntryFormat *format = NULL; - rz_vector_foreach(&hdr->directory_entry_formats, format) { + rz_vector_foreach (&hdr->directory_entry_formats, format) { RzBinDwarfAttr attr = { 0 }; AttrOption opt = { .form = format->form, @@ -110,7 +110,7 @@ static bool FileEntry_parse_v5(DWLineContext *ctx, RzBinDwarfFileEntry *entry) { RzBinEndianReader *R = ctx->line->R; RzBinDwarfLineUnitHdr *hdr = ctx->hdr; RzBinDwarfFileEntryFormat *format = NULL; - rz_vector_foreach(&hdr->file_name_entry_formats, format) { + rz_vector_foreach (&hdr->file_name_entry_formats, format) { RzBinDwarfAttr attr = { 0 }; AttrOption opt = { .form = format->form, @@ -671,7 +671,7 @@ static RzBinDwarfLine *Line_parse( SMRegisters_reset(&unit->hdr, ®s); RzBinDwarfLineOp *op; - rz_vector_foreach(&unit->ops, op) { + rz_vector_foreach (&unit->ops, op) { if (!LineOp_run(op, &ctx)) { break; } @@ -836,7 +836,7 @@ static void line_unit_dump( rz_strbuf_append(sb, "Line table statements:\n"); void *opsit; size_t i; - rz_vector_enumerate(&unit->ops, opsit, i) { + rz_vector_enumerate (&unit->ops, opsit, i) { RzBinDwarfLineOp *op = opsit; rz_strbuf_append(sb, "\t"); line_op_dump(op, &unit->hdr, sb); diff --git a/librz/bin/dwarf/op.c b/librz/bin/dwarf/op.c index 22ccead42ac..2ce68532a4f 100644 --- a/librz/bin/dwarf/op.c +++ b/librz/bin/dwarf/op.c @@ -608,7 +608,7 @@ static RzBinDwarfValueType ValueType_from_die( ut8 byte_size = 0; const char *name = NULL; DW_ATE ate = 0; - rz_vector_foreach(&die->attrs, attr) { + rz_vector_foreach (&die->attrs, attr) { switch (attr->at) { case DW_AT_name: name = rz_bin_dwarf_attr_string(attr, (RzBinDWARF *)dw, 0); @@ -1592,7 +1592,7 @@ RZ_API void rz_bin_dwarf_expression_dump( Operation *op = NULL; ut32 i; const ut32 end = rz_vector_len(exprs) - 1; - rz_vector_enumerate(exprs, op, i) { + rz_vector_enumerate (exprs, op, i) { rz_strbuf_append(sb, rz_str_get(opt->expr_indent)); Operation_dump(op, sb); if (i < end) { @@ -1671,7 +1671,7 @@ RZ_API void rz_bin_dwarf_location_composite_dump( ut32 i = 0; const ut32 end = rz_vector_len(composite) - 1; RzBinDwarfPiece *piece = NULL; - rz_vector_enumerate(composite, piece, i) { + rz_vector_enumerate (composite, piece, i) { rz_strbuf_append(sb, rz_str_get(opt->composite_indent)); rz_strbuf_appendf(sb, "(.%" PFMT64u ", %" PFMT64u "): ", piece->bit_offset, piece->size_in_bits); diff --git a/librz/bin/dwarf/unit.c b/librz/bin/dwarf/unit.c index 42de760ab3c..d6bdc0c42da 100644 --- a/librz/bin/dwarf/unit.c +++ b/librz/bin/dwarf/unit.c @@ -87,7 +87,7 @@ static bool CU_attrs_parse( die->offset, rz_str_indent(die->depth), rz_bin_dwarf_tag(die->tag), die->abbrev_code, rz_bin_dwarf_children(die->has_children)); RzBinDwarfAttrSpec *spec = NULL; - rz_vector_foreach(&abbrev_decl->defs, spec) { + rz_vector_foreach (&abbrev_decl->defs, spec) { RzBinDwarfAttr attr = { 0 }; AttrOption opt = { .dw = ctx->dw, @@ -133,7 +133,7 @@ static bool CU_attrs_parse( apply_attr_opt(ctx, cu, die, DW_AT_loclists_base); apply_attr_opt(ctx, cu, die, DW_AT_rnglists_base); RzBinDwarfAttr *attr; - rz_vector_foreach(&die->attrs, attr) { + rz_vector_foreach (&die->attrs, attr) { CU_attr_apply(ctx, cu, attr); } } @@ -304,7 +304,7 @@ RZ_API RZ_BORROW RzBinDwarfAttr *rz_bin_dwarf_die_get_attr( RZ_BORROW RZ_NONNULL const RzBinDwarfDie *die, DW_AT name) { rz_return_val_if_fail(die, NULL); RzBinDwarfAttr *attr = NULL; - rz_vector_foreach(&die->attrs, attr) { + rz_vector_foreach (&die->attrs, attr) { if (attr->at == name) { return attr; } @@ -368,7 +368,7 @@ RZ_API RZ_OWN RzBinDwarfInfo *rz_bin_dwarf_info_from_buf( // build hashtable after whole parsing because of possible relocations RzBinDwarfCompUnit *unit = NULL; - rz_vector_foreach(&info->units, unit) { + rz_vector_foreach (&info->units, unit) { ht_up_insert(info->unit_by_offset, unit->offset, unit); switch (unit->hdr.ut) { case DW_UT_skeleton: { @@ -390,7 +390,7 @@ RZ_API RZ_OWN RzBinDwarfInfo *rz_bin_dwarf_info_from_buf( } RzBinDwarfDie *die = NULL; - rz_vector_foreach(&unit->dies, die) { + rz_vector_foreach (&unit->dies, die) { ht_up_insert(info->die_by_offset, die->offset, die); // optimization for further processing } } @@ -426,7 +426,7 @@ RZ_API void rz_bin_dwarf_debug_info_dump( rz_strbuf_append(sb, "\n.debug_info content:\n"); } RzBinDwarfCompUnit *unit = NULL; - rz_vector_foreach(&info->units, unit) { + rz_vector_foreach (&info->units, unit) { const char *ut = rz_bin_dwarf_unit_type(unit->hdr.ut ? unit->hdr.ut : DW_UT_compile); rz_strbuf_appendf(sb, "0x%08" PFMT64x ":\t%s\n", unit->offset, ut); rz_strbuf_appendf(sb, "\tLength\t0x%" PFMT64x "\n", unit->hdr.length); @@ -436,12 +436,12 @@ RZ_API void rz_bin_dwarf_debug_info_dump( rz_strbuf_append(sb, "\n"); RzBinDwarfDie *die = NULL; - rz_vector_foreach(&unit->dies, die) { + rz_vector_foreach (&unit->dies, die) { rz_strbuf_appendf(sb, "%#08" PFMT64x ": %s [%" PFMT64u "]\n", die->offset, rz_bin_dwarf_tag(die->tag), die->abbrev_code); if (die->abbrev_code) { RzBinDwarfAttr *attr = NULL; - rz_vector_foreach(&die->attrs, attr) { + rz_vector_foreach (&die->attrs, attr) { if (!attr->at) { continue; } diff --git a/librz/bin/dwarf/value.c b/librz/bin/dwarf/value.c index 64d78b90cc7..1b64cd8016a 100644 --- a/librz/bin/dwarf/value.c +++ b/librz/bin/dwarf/value.c @@ -102,7 +102,7 @@ RZ_IPI bool ValueType_from_entry(RzBinDwarfDie *entry, RzBinDwarfValueType *out) RzBinDwarfAttr *attr; // Assuming Attribute is defined elsewhere - rz_vector_foreach(&entry->attrs, attr) { + rz_vector_foreach (&entry->attrs, attr) { switch (attr->at) { case DW_AT_byte_size: byte_size = rz_bin_dwarf_attr_udata(attr); diff --git a/librz/bin/format/bflt/bflt.c b/librz/bin/format/bflt/bflt.c index 1448329245f..754399d60dc 100644 --- a/librz/bin/format/bflt/bflt.c +++ b/librz/bin/format/bflt/bflt.c @@ -122,7 +122,7 @@ static void bflt_load_relocs(RzBfltObj *bin) { static void patch_relocs_in(RzBfltObj *bin, RzVector /**/ *relocs) { RzBfltReloc *reloc; - rz_vector_foreach(relocs, reloc) { + rz_vector_foreach (relocs, reloc) { if (!reloc->value_orig) { // 0 relocs are not patched (this is some workaround for null pointers in the uClinux kernel) continue; diff --git a/librz/bin/format/elf/elf.h b/librz/bin/format/elf/elf.h index cc9c0a7a97a..a09d9b64117 100644 --- a/librz/bin/format/elf/elf.h +++ b/librz/bin/format/elf/elf.h @@ -25,31 +25,31 @@ #define rz_bin_elf_foreach_segments(bin, segment) \ if (Elf_(rz_bin_elf_has_segments)(bin)) \ - rz_vector_foreach((bin)->segments, segment) + rz_vector_foreach ((bin)->segments, segment) #define rz_bin_elf_foreach_sections(bin, section) \ if (Elf_(rz_bin_elf_has_sections)(bin)) \ - rz_vector_foreach((bin)->sections, section) + rz_vector_foreach ((bin)->sections, section) #define rz_bin_elf_enumerate_sections(bin, section, i) \ if (Elf_(rz_bin_elf_has_sections)(bin)) \ - rz_vector_enumerate((bin)->sections, section, i) + rz_vector_enumerate ((bin)->sections, section, i) #define rz_bin_elf_foreach_relocs(bin, reloc) \ if (Elf_(rz_bin_elf_has_relocs)(bin)) \ - rz_vector_foreach((bin)->relocs, reloc) + rz_vector_foreach ((bin)->relocs, reloc) #define rz_bin_elf_foreach_notes_segment(bin, notes) \ if (Elf_(rz_bin_elf_has_notes)(bin)) \ - rz_vector_foreach((bin)->notes, notes) + rz_vector_foreach ((bin)->notes, notes) #define rz_bin_elf_foreach_symbols(bin, symbol) \ if (Elf_(rz_bin_elf_has_symbols)(bin)) \ - rz_vector_foreach(bin->symbols, symbol) + rz_vector_foreach (bin->symbols, symbol) #define rz_bin_elf_foreach_imports(bin, import) \ if (Elf_(rz_bin_elf_has_imports)(bin)) \ - rz_vector_foreach(bin->imports, import) + rz_vector_foreach (bin->imports, import) struct gnu_hash_table { // DT_GNU_HASH Elf_(Word) nbuckets; diff --git a/librz/bin/format/elf/elf_corefile.c b/librz/bin/format/elf/elf_corefile.c index 17b7cf4b7ea..d2d582671fc 100644 --- a/librz/bin/format/elf/elf_corefile.c +++ b/librz/bin/format/elf/elf_corefile.c @@ -24,7 +24,7 @@ ut64 Elf_(rz_bin_elf_get_sp_val)(RZ_NONNULL ELFOBJ *bin) { RzVector *notes; rz_bin_elf_foreach_notes_segment(bin, notes) { RzBinElfNote *tmp; - rz_vector_foreach(notes, tmp) { + rz_vector_foreach (notes, tmp) { if (tmp->type != NT_PRSTATUS) { continue; } diff --git a/librz/bin/format/elf/elf_imports.c b/librz/bin/format/elf/elf_imports.c index 9f0e3644bbb..0f8b5f5c0d1 100644 --- a/librz/bin/format/elf/elf_imports.c +++ b/librz/bin/format/elf/elf_imports.c @@ -346,7 +346,7 @@ static void convert_elf_symbol_to_elf_import(ELFOBJ *bin, RzBinElfSymbol *symbol static void convert_elf_symbols_to_elf_imports(ELFOBJ *bin, RzVector /**/ *symbols) { RzBinElfSymbol *symbol; - rz_vector_foreach(symbols, symbol) { + rz_vector_foreach (symbols, symbol) { convert_elf_symbol_to_elf_import(bin, symbol); } } diff --git a/librz/bin/format/elf/elf_info.c b/librz/bin/format/elf/elf_info.c index 23d9c75588a..906e2132771 100644 --- a/librz/bin/format/elf/elf_info.c +++ b/librz/bin/format/elf/elf_info.c @@ -918,7 +918,7 @@ RZ_OWN RzPVector /**/ *Elf_(rz_bin_elf_get_libs)(RZ_NONNULL ELFOBJ *bin) } ut64 *iter = NULL; - rz_vector_foreach(dt_needed, iter) { + rz_vector_foreach (dt_needed, iter) { char *tmp = Elf_(rz_bin_elf_strtab_get_dup)(bin->dynstr, *iter); if (!tmp) { rz_pvector_free(result); diff --git a/librz/bin/format/elf/elf_sections.c b/librz/bin/format/elf/elf_sections.c index 628d52764eb..aeaa280d004 100644 --- a/librz/bin/format/elf/elf_sections.c +++ b/librz/bin/format/elf/elf_sections.c @@ -335,7 +335,7 @@ static RzVector /**/ *convert_sections_from_shdr(ELFOBJ *bin, R size_t i; Elf_(Shdr) * section; - rz_vector_enumerate(sections, section, i) { + rz_vector_enumerate (sections, section, i) { RzBinElfSection tmp = convert_elf_section(bin, options, section, i); if (!rz_vector_push(result, &tmp)) { rz_vector_free(result); diff --git a/librz/bin/format/elf/elf_symbols.c b/librz/bin/format/elf/elf_symbols.c index 77dc5facc4c..f6e81c4d938 100644 --- a/librz/bin/format/elf/elf_symbols.c +++ b/librz/bin/format/elf/elf_symbols.c @@ -406,11 +406,11 @@ static bool get_gnu_debugdata_elf_symbols(ELFOBJ *bin, RzVector /*name, sym); } - rz_vector_foreach(debug_symbols, sym) { + rz_vector_foreach (debug_symbols, sym) { bool found; ht_sp_find(name_set, sym->name, &found); if (found) { diff --git a/librz/bin/format/le/le.c b/librz/bin/format/le/le.c index d2f55389025..a65dee80332 100644 --- a/librz/bin/format/le/le.c +++ b/librz/bin/format/le/le.c @@ -156,7 +156,7 @@ static ut32 le_obj_perm(LE_object *obj) { static ut64 le_vaddr_to_paddr(rz_bin_le_obj_t *bin, ut32 vaddr) { LE_map *m; - rz_vector_foreach(bin->le_maps, m) { + rz_vector_foreach (bin->le_maps, m) { if (m->vaddr <= vaddr && vaddr <= m->vaddr + m->vsize) { if (vaddr > m->vaddr + m->size) { return 0; @@ -728,7 +728,7 @@ static RZ_OWN RzVector /**/ *le_load_entries(rz_bin_le_obj_t *bin) { // try naming entries accessible only by ordinal LE_entry *e; int ei = 0; - rz_vector_foreach(entries, e) { + rz_vector_foreach (entries, e) { ei++; if (!e->is_empty && !e->is_forwarder && e->symbol && !e->symbol->name) { e->symbol->name = rz_str_newf("%u", ei); @@ -1091,13 +1091,13 @@ static RzVector /**/ *le_create_maps(rz_bin_le_obj_t *bin) { // name maps LE_map *m; ut32 num = 1; - rz_vector_foreach(le_maps, m) { + rz_vector_foreach (le_maps, m) { const char *map_kind = m->is_physical ? "physical" : "virtual"; CHECK(m->vfile_name = rz_str_newf("obj%d-%s%u", m->obj_num, map_kind, num++)); } // allocate buffers, fill zero pages, unpack compressed pages - rz_vector_foreach(le_maps, m) { + rz_vector_foreach (le_maps, m) { if (m->is_physical) { continue; } @@ -1138,7 +1138,7 @@ static RzVector /**/ *le_create_maps(rz_bin_le_obj_t *bin) { // calculate reloc_target_map_base ut32 max_vaddr = 0; - rz_vector_foreach(le_maps, m) { + rz_vector_foreach (le_maps, m) { max_vaddr = RZ_MAX(max_vaddr, m->vaddr + m->vsize); } CHECK(h->pagesize); @@ -1181,7 +1181,7 @@ static bool le_patch_relocs(rz_bin_le_obj_t *bin) { // mark last map for each object CHECK(last_map = RZ_NEWS0(LE_map *, bin->header->objcnt)); LE_map *m; - rz_vector_foreach(bin->le_maps, m) { + rz_vector_foreach (bin->le_maps, m) { last_map[m->obj_num - 1] = m; } @@ -1621,7 +1621,7 @@ RZ_OWN RzPVector /**/ *rz_bin_le_get_sections(RzBinFile *bf) { ut32 obj_num = 0, sec_num = 0; LE_map *le_map; - rz_vector_foreach(bin->le_maps, le_map) { + rz_vector_foreach (bin->le_maps, le_map) { CHECK(sec = RZ_NEW0(RzBinSection)); if (obj_num == le_map->obj_num) { @@ -1673,7 +1673,7 @@ RZ_OWN RzPVector /**/ *rz_bin_le_get_entry_points(RzBinFile *bf) { // Exported functions, only DLLs have these. LE_entry *e; - rz_vector_foreach(bin->le_entries, e) { + rz_vector_foreach (bin->le_entries, e) { if (!e->is_empty && !e->is_forwarder && e->is_exported && e->symbol) { CHECK(addr = RZ_NEW0(RzBinAddr)); addr->vaddr = e->symbol->vaddr; @@ -1732,7 +1732,7 @@ RZ_OWN RzPVector /**/ *rz_bin_le_get_virtual_files(RzBinFile // virtual file per memory range not backed by physical pages (unpacked & zero-filled pages) LE_map *le_map; - rz_vector_foreach(bin->le_maps, le_map) { + rz_vector_foreach (bin->le_maps, le_map) { if (le_map->is_physical) { continue; } @@ -1834,7 +1834,7 @@ RZ_OWN RzPVector /**/ *rz_bin_le_get_maps(RzBinFile *bf) { LE_map *le_map; ut32 map_num = 0; ut32 obj_num = 0; - rz_vector_foreach(bin->le_maps, le_map) { + rz_vector_foreach (bin->le_maps, le_map) { LE_object *obj = &bin->objects[le_map->obj_num - 1]; if (le_map->obj_num != obj_num) { obj_num = le_map->obj_num; diff --git a/librz/bin/p/bin_bflt.c b/librz/bin/p/bin_bflt.c index b1bb65707d6..23196c15c6a 100644 --- a/librz/bin/p/bin_bflt.c +++ b/librz/bin/p/bin_bflt.c @@ -184,7 +184,7 @@ static RzPVector /**/ *virtual_files(RzBinFile *bf) { static void convert_relocs(RzBfltObj *bin, RzPVector /**/ *out, RzVector /**/ *relocs) { RzBfltReloc *br; - rz_vector_foreach(relocs, br) { + rz_vector_foreach (relocs, br) { RzBinReloc *r = RZ_NEW0(RzBinReloc); if (!r) { return; diff --git a/librz/bin/p/bin_elf.inc b/librz/bin/p/bin_elf.inc index ebd7f2accf0..aebf8592f94 100644 --- a/librz/bin/p/bin_elf.inc +++ b/librz/bin/p/bin_elf.inc @@ -557,7 +557,7 @@ static char *regstate(RzBinFile *bf) { RzVector *notes; rz_bin_elf_foreach_notes_segment(obj, notes) { RzBinElfNote *tmp; - rz_vector_foreach(notes, tmp) { + rz_vector_foreach (notes, tmp) { if (tmp->type != NT_PRSTATUS) { continue; } @@ -620,7 +620,7 @@ static RzBinElfNoteFile *note_file_for_load_segment(ELFOBJ *obj, Elf_(Phdr) * ph RzVector *notes; rz_bin_elf_foreach_notes_segment(obj, notes) { RzBinElfNote *tmp; - rz_vector_foreach(notes, tmp) { + rz_vector_foreach (notes, tmp) { if (tmp->type != NT_FILE) { continue; } diff --git a/librz/bin/pdb/tpi.c b/librz/bin/pdb/tpi.c index e9303689ee5..4f4f00301c7 100644 --- a/librz/bin/pdb/tpi.c +++ b/librz/bin/pdb/tpi.c @@ -686,7 +686,7 @@ RZ_API ut64 rz_bin_pdb_get_type_val(RZ_NONNULL RzPdbTpiType *type) { Tpi_LF_Array *a = type->data; ut64 y = 0; ut32 *x; - rz_vector_foreach(&a->dimensions, x) { + rz_vector_foreach (&a->dimensions, x) { y = y == 0 ? *x : (*x * y); } return y; diff --git a/librz/core/analysis_objc.c b/librz/core/analysis_objc.c index c77cc1f0a1c..74e7116a4bf 100644 --- a/librz/core/analysis_objc.c +++ b/librz/core/analysis_objc.c @@ -36,7 +36,7 @@ static void array_add(RzCoreObjc *o, ut64 va, ut64 xrefs_to) { ht_up_insert(o->up, va, vec); } ut64 *addr; - rz_vector_foreach(vec, addr) { + rz_vector_foreach (vec, addr) { if (xrefs_to == *addr) { return; } @@ -106,7 +106,7 @@ static ut64 getRefPtr(RzCoreObjc *o, ut64 classMethodsVA, bool *rfound) { return false; } ut64 *addr; - rz_vector_foreach(vec, addr) { + rz_vector_foreach (vec, addr) { const ut64 at = *addr; if (inBetween(o->_selrefs, at)) { isMsgRef = false; diff --git a/librz/core/canalysis.c b/librz/core/canalysis.c index a22efaf3bde..023d300c867 100644 --- a/librz/core/canalysis.c +++ b/librz/core/canalysis.c @@ -1097,7 +1097,7 @@ static void print_hint_h_format(HintNode *node) { switch (node->type) { case HINT_NODE_ADDR: { const RzAnalysisAddrHintRecord *record; - rz_vector_foreach(node->addr_hints, record) { + rz_vector_foreach (node->addr_hints, record) { switch (record->type) { case RZ_ANALYSIS_ADDR_HINT_TYPE_IMMBASE: rz_cons_printf(" immbase=%d", record->immbase); @@ -1179,7 +1179,7 @@ static void hint_node_print(HintNode *node, RzOutputMode mode, PJ *pj) { switch (node->type) { case HINT_NODE_ADDR: { const RzAnalysisAddrHintRecord *record; - rz_vector_foreach(node->addr_hints, record) { + rz_vector_foreach (node->addr_hints, record) { switch (record->type) { case RZ_ANALYSIS_ADDR_HINT_TYPE_IMMBASE: HINTCMD_ADDR(node, "ahi %d", record->immbase); @@ -1250,7 +1250,7 @@ static void hint_node_print(HintNode *node, RzOutputMode mode, PJ *pj) { switch (node->type) { case HINT_NODE_ADDR: { const RzAnalysisAddrHintRecord *record; - rz_vector_foreach(node->addr_hints, record) { + rz_vector_foreach (node->addr_hints, record) { switch (record->type) { case RZ_ANALYSIS_ADDR_HINT_TYPE_IMMBASE: pj_ki(pj, "immbase", record->immbase); diff --git a/librz/core/cannotated_code.c b/librz/core/cannotated_code.c index 8b2e3f6ea8e..3ef0f0ef844 100644 --- a/librz/core/cannotated_code.c +++ b/librz/core/cannotated_code.c @@ -21,7 +21,7 @@ RZ_API void rz_core_annotated_code_print_json(RzAnnotatedCode *code) { char *type_str; RzCodeAnnotation *annotation; - rz_vector_foreach(&code->annotations, annotation) { + rz_vector_foreach (&code->annotations, annotation) { pj_o(pj); pj_kn(pj, "start", (ut64)annotation->start); pj_kn(pj, "end", (ut64)annotation->end); @@ -156,7 +156,7 @@ RZ_API void rz_core_annotated_code_print(RzAnnotatedCode *code, RzVector /* offset_max) { offset_max = *offset; } @@ -172,7 +172,7 @@ RZ_API void rz_core_annotated_code_print(RzAnnotatedCode *code, RzVector /*annotations, annotation) { + rz_vector_foreach (&code->annotations, annotation) { if (annotation->type != RZ_CODE_ANNOTATION_TYPE_SYNTAX_HIGHLIGHT) { continue; } @@ -271,7 +271,7 @@ static bool foreach_offset_annotation(void *user, const ut64 offset, const void RZ_API void rz_core_annotated_code_print_comment_cmds(RzAnnotatedCode *code) { RzCodeAnnotation *annotation; HtUP *ht = ht_up_new(NULL, NULL); - rz_vector_foreach(&code->annotations, annotation) { + rz_vector_foreach (&code->annotations, annotation) { if (annotation->type != RZ_CODE_ANNOTATION_TYPE_OFFSET) { continue; } diff --git a/librz/core/cbin.c b/librz/core/cbin.c index 8fee618db60..fd56a960e8a 100644 --- a/librz/core/cbin.c +++ b/librz/core/cbin.c @@ -5174,7 +5174,7 @@ RZ_API bool rz_core_bin_sections_mapping_print(RZ_NONNULL RzCore *core, RZ_NONNU rz_cmd_state_output_array_start(state); RzBinSectionMap *map; - rz_vector_foreach(maps, map) { + rz_vector_foreach (maps, map) { RzStrBuf *sb = rz_strbuf_new(NULL); const char *space = ""; void **it; diff --git a/librz/core/cesil.c b/librz/core/cesil.c index b9095aaa2d7..480399c1546 100644 --- a/librz/core/cesil.c +++ b/librz/core/cesil.c @@ -294,7 +294,7 @@ RZ_API bool rz_core_esil_continue_back(RZ_NONNULL RzCore *core) { bool bp_found = false; int idx = 0; RzAnalysisEsilRegChange *reg; - rz_vector_foreach_prev(vreg, reg) { + rz_vector_foreach_prev (vreg, reg) { if (reg->idx >= esil->trace->idx) { continue; } diff --git a/librz/core/cmd/cmd_analysis.c b/librz/core/cmd/cmd_analysis.c index 66217d0b84f..005db6de7b2 100644 --- a/librz/core/cmd/cmd_analysis.c +++ b/librz/core/cmd/cmd_analysis.c @@ -220,7 +220,7 @@ static void var_accesses_list(RzAnalysisFunction *fcn, RzAnalysisVar *var, PJ *p } else { rz_cons_printf("%10s", name); } - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { if (!(acc->type & access_type)) { continue; } @@ -254,7 +254,7 @@ static void list_vars(RzCore *core, RzAnalysisFunction *fcn, PJ *pj, int type, c RzAnalysisVar *var = *it; rz_cons_printf("* %s\n", var->name); RzAnalysisVarAccess *acc; - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { if (!(acc->type & RZ_ANALYSIS_VAR_ACCESS_TYPE_READ)) { continue; } @@ -262,7 +262,7 @@ static void list_vars(RzCore *core, RzAnalysisFunction *fcn, PJ *pj, int type, c rz_core_seek(core, fcn->addr + acc->offset, 1); rz_core_print_disasm_instructions(core, 0, 1); } - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { if (!(acc->type & RZ_ANALYSIS_VAR_ACCESS_TYPE_WRITE)) { continue; } @@ -2726,7 +2726,7 @@ RZ_IPI RzCmdStatus rz_analysis_function_vars_dis_refs_handler(RzCore *core, int RzAnalysisVar *var = *it; rz_cons_printf("* %s\n", var->name); RzAnalysisVarAccess *acc; - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { if (!(acc->type & RZ_ANALYSIS_VAR_ACCESS_TYPE_READ)) { continue; } @@ -2734,7 +2734,7 @@ RZ_IPI RzCmdStatus rz_analysis_function_vars_dis_refs_handler(RzCore *core, int rz_core_seek(core, fcn->addr + acc->offset, 1); rz_core_print_disasm_instructions(core, 0, 1); } - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { if (!(acc->type & RZ_ANALYSIS_VAR_ACCESS_TYPE_WRITE)) { continue; } @@ -5039,7 +5039,7 @@ static void analysis_class_print(RzAnalysis *analysis, const char *class_name, b if (bases) { RzAnalysisBaseClass *base; bool first = true; - rz_vector_foreach(bases, base) { + rz_vector_foreach (bases, base) { if (first) { rz_cons_print(": "); first = false; @@ -5057,7 +5057,7 @@ static void analysis_class_print(RzAnalysis *analysis, const char *class_name, b RzVector *vtables = rz_analysis_class_vtable_get_all(analysis, class_name); if (vtables) { RzAnalysisVTable *vtable; - rz_vector_foreach(vtables, vtable) { + rz_vector_foreach (vtables, vtable) { rz_cons_printf(" (vtable at 0x%" PFMT64x, vtable->addr); if (vtable->offset > 0) { rz_cons_printf(" in class at +0x%" PFMT64x ")\n", vtable->offset); @@ -5076,7 +5076,7 @@ static void analysis_class_print(RzAnalysis *analysis, const char *class_name, b char *method_type[] = { "DEFAULT", "VIRTUAL", "V_DESTRUCTOR", "DESTRUCTOR", "CONSTRUCTOR" }; RzAnalysisMethod *meth; int i = 1; - rz_vector_foreach(methods, meth) { + rz_vector_foreach (methods, meth) { ut64 vtable = meth->vtable_offset >= 0 ? meth->vtable_offset : UT64_MAX; rz_table_add_rowf(table, "dXXss", i, meth->addr, vtable, method_type[meth->method_type], meth->real_name); i++; @@ -5099,7 +5099,7 @@ static void analysis_class_print_to_json(RzAnalysis *analysis, PJ *pj, const cha RzVector *bases = rz_analysis_class_base_get_all(analysis, class_name); if (bases) { RzAnalysisBaseClass *base; - rz_vector_foreach(bases, base) { + rz_vector_foreach (bases, base) { pj_o(pj); pj_ks(pj, "id", base->id); pj_ks(pj, "name", base->class_name); @@ -5115,7 +5115,7 @@ static void analysis_class_print_to_json(RzAnalysis *analysis, PJ *pj, const cha RzVector *vtables = rz_analysis_class_vtable_get_all(analysis, class_name); if (vtables) { RzAnalysisVTable *vtable; - rz_vector_foreach(vtables, vtable) { + rz_vector_foreach (vtables, vtable) { pj_o(pj); pj_ks(pj, "id", vtable->id); pj_kn(pj, "addr", vtable->addr); @@ -5131,7 +5131,7 @@ static void analysis_class_print_to_json(RzAnalysis *analysis, PJ *pj, const cha if (methods) { char *method_type[] = { "DEFAULT", "VIRTUAL", "V_DESTRUCTOR", "DESTRUCTOR", "CONSTRUCTOR" }; RzAnalysisMethod *meth; - rz_vector_foreach(methods, meth) { + rz_vector_foreach (methods, meth) { pj_o(pj); pj_ks(pj, "name", meth->real_name); pj_kn(pj, "addr", meth->addr); @@ -5173,7 +5173,7 @@ static void analysis_class_print_as_cmd(RzAnalysis *analysis, const char *class_ RzVector *bases = rz_analysis_class_base_get_all(analysis, class_name); if (bases) { RzAnalysisBaseClass *base; - rz_vector_foreach(bases, base) { + rz_vector_foreach (bases, base) { rz_cons_printf("acb %s %s %" PFMT64u "\n", class_name, base->class_name, base->offset); } rz_vector_free(bases); @@ -5182,7 +5182,7 @@ static void analysis_class_print_as_cmd(RzAnalysis *analysis, const char *class_ RzVector *vtables = rz_analysis_class_vtable_get_all(analysis, class_name); if (vtables) { RzAnalysisVTable *vtable; - rz_vector_foreach(vtables, vtable) { + rz_vector_foreach (vtables, vtable) { rz_cons_printf("acv %s 0x%" PFMT64x " %" PFMT64u "\n", class_name, vtable->addr, vtable->offset); } rz_vector_free(vtables); @@ -5191,7 +5191,7 @@ static void analysis_class_print_as_cmd(RzAnalysis *analysis, const char *class_ RzVector *methods = rz_analysis_class_method_get_all(analysis, class_name); if (methods) { RzAnalysisMethod *meth; - rz_vector_foreach(methods, meth) { + rz_vector_foreach (methods, meth) { rz_cons_printf("acm %s %s 0x%" PFMT64x " %" PFMT64d "\n", class_name, meth->name, meth->addr, meth->vtable_offset); } rz_vector_free(methods); @@ -5395,7 +5395,7 @@ RZ_IPI RzCmdStatus rz_analysis_class_base_list_handler(RzCore *core, int argc, c RzVector *bases = rz_analysis_class_base_get_all(core->analysis, class_name); RzAnalysisBaseClass *base; - rz_vector_foreach(bases, base) { + rz_vector_foreach (bases, base) { rz_cons_printf(" %4s %s @ +0x%" PFMT64x "\n", base->id, base->class_name, base->offset); } rz_vector_free(bases); @@ -5456,7 +5456,7 @@ RZ_IPI RzCmdStatus rz_analysis_class_vtable_list_handler(RzCore *core, int argc, RzVector *vtables = rz_analysis_class_vtable_get_all(core->analysis, class_name); if (vtables) { RzAnalysisVTable *vtable; - rz_vector_foreach(vtables, vtable) { + rz_vector_foreach (vtables, vtable) { rz_cons_printf(" %4s vtable 0x%" PFMT64x " @ +0x%" PFMT64x " size:+0x%" PFMT64x "\n", vtable->id, vtable->addr, vtable->offset, vtable->size); } rz_vector_free(vtables); @@ -5475,7 +5475,7 @@ static void list_all_functions_at_vtable_offset(RzAnalysis *analysis, const char } RzAnalysisVTable *vtable; - rz_vector_foreach(vtables, vtable) { + rz_vector_foreach (vtables, vtable) { if (vtable->size < offset + function_ptr_size || offset % function_ptr_size) { continue; } diff --git a/librz/core/cpdb.c b/librz/core/cpdb.c index e160722e2f9..a2dc89d7b41 100644 --- a/librz/core/cpdb.c +++ b/librz/core/cpdb.c @@ -35,7 +35,7 @@ static void pdb_types_print_json(const RzTypeDB *db, const RzPdb *pdb, const RzL pj_kn(pj, "size", type->size); pj_ka(pj, "members"); RzTypeStructMember *memb; - rz_vector_foreach(&type->struct_data.members, memb) { + rz_vector_foreach (&type->struct_data.members, memb) { pj_o(pj); char *typ = rz_type_as_string(db, memb->type); pj_ks(pj, "member_type", typ); @@ -55,7 +55,7 @@ static void pdb_types_print_json(const RzTypeDB *db, const RzPdb *pdb, const RzL pj_kn(pj, "size", type->size); pj_ka(pj, "members"); RzTypeUnionMember *memb; - rz_vector_foreach(&type->union_data.members, memb) { + rz_vector_foreach (&type->union_data.members, memb) { pj_o(pj); char *typ = rz_type_as_string(db, memb->type); pj_ks(pj, "member_type", typ); @@ -77,7 +77,7 @@ static void pdb_types_print_json(const RzTypeDB *db, const RzPdb *pdb, const RzL RZ_FREE(typ); pj_ka(pj, "cases"); RzTypeEnumCase *cas; - rz_vector_foreach(&type->enum_data.cases, cas) { + rz_vector_foreach (&type->enum_data.cases, cas) { pj_o(pj); pj_ks(pj, "enum_name", cas->name); pj_kn(pj, "enum_val", cas->val); diff --git a/librz/core/ctypes.c b/librz/core/ctypes.c index c99b4022b28..d0736157ab4 100644 --- a/librz/core/ctypes.c +++ b/librz/core/ctypes.c @@ -75,7 +75,7 @@ RZ_IPI void rz_core_types_enum_print(RzCore *core, const RzBaseType *btype, RzOu pj_k(pj, "values"); pj_o(pj); RzTypeEnumCase *cas; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { pj_kn(pj, cas->name, cas->val); } pj_end(pj); @@ -86,7 +86,7 @@ RZ_IPI void rz_core_types_enum_print(RzCore *core, const RzBaseType *btype, RzOu case RZ_OUTPUT_MODE_STANDARD: { if (btype && !rz_vector_empty(&btype->enum_data.cases)) { RzTypeEnumCase *cas; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { rz_cons_printf("%s = 0x%" PFMT64x "\n", cas->name, cas->val); } } @@ -162,7 +162,7 @@ RZ_IPI void rz_core_types_union_print(RzCore *core, const RzBaseType *btype, RzO pj_k(pj, "members"); pj_o(pj); RzTypeUnionMember *memb; - rz_vector_foreach(&btype->union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { char *mtype = rz_type_as_string(core->analysis->typedb, memb->type); pj_ks(pj, memb->name, mtype); free(mtype); @@ -176,7 +176,7 @@ RZ_IPI void rz_core_types_union_print(RzCore *core, const RzBaseType *btype, RzO rz_cons_printf("union %s:\n", btype->name); if (btype && !rz_vector_empty(&btype->union_data.members)) { RzTypeUnionMember *memb; - rz_vector_foreach(&btype->union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { char *mtype = rz_type_as_string(core->analysis->typedb, memb->type); ut64 size = rz_type_db_get_bitsize(core->analysis->typedb, memb->type) / 8; rz_cons_printf("\t%s: %s (size = %" PFMT64d ")\n", memb->name, mtype, size); @@ -255,7 +255,7 @@ RZ_IPI void rz_core_types_struct_print(RzCore *core, const RzBaseType *btype, Rz pj_k(pj, "members"); pj_o(pj); RzTypeStructMember *memb; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { char *mtype = rz_type_as_string(core->analysis->typedb, memb->type); pj_ks(pj, memb->name, mtype); free(mtype); @@ -269,7 +269,7 @@ RZ_IPI void rz_core_types_struct_print(RzCore *core, const RzBaseType *btype, Rz if (btype && !rz_vector_empty(&btype->union_data.members)) { RzTypeStructMember *memb; ut64 offset = 0; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { char *mtype = rz_type_as_string(core->analysis->typedb, memb->type); ut64 size = rz_type_db_get_bitsize(core->analysis->typedb, memb->type) / 8; rz_cons_printf("\t%s: %s (size = %" PFMT64d ", offset = %" PFMT64d ")\n", diff --git a/librz/core/seek.c b/librz/core/seek.c index 5685401e495..a29b48bf17f 100644 --- a/librz/core/seek.c +++ b/librz/core/seek.c @@ -418,7 +418,7 @@ RZ_API RzList /**/ *rz_core_seek_list(RzCore *core) { RzCoreSeekItem *it; int i = -rz_vector_len(&core->seek_history.undos); - rz_vector_foreach(&core->seek_history.undos, it) { + rz_vector_foreach (&core->seek_history.undos, it) { RzCoreSeekItem *dup = dup_seek_history_item(it, i++); if (!dup) { goto err; @@ -433,7 +433,7 @@ RZ_API RzList /**/ *rz_core_seek_list(RzCore *core) { rz_list_append(res, cur); i = 1; - rz_vector_foreach_prev(&core->seek_history.redos, it) { + rz_vector_foreach_prev (&core->seek_history.redos, it) { RzCoreSeekItem *dup = dup_seek_history_item(it, i++); if (!dup) { goto err; diff --git a/librz/core/tui/classes.c b/librz/core/tui/classes.c index cbb3ead7969..0e34faa3bc7 100644 --- a/librz/core/tui/classes.c +++ b/librz/core/tui/classes.c @@ -397,7 +397,7 @@ static void analysis_class_print(RzAnalysis *analysis, const char *class_name) { if (bases) { RzAnalysisBaseClass *base; bool first = true; - rz_vector_foreach(bases, base) { + rz_vector_foreach (bases, base) { if (first) { rz_cons_print(": "); first = false; @@ -413,7 +413,7 @@ static void analysis_class_print(RzAnalysis *analysis, const char *class_name) { if (vtables) { RzAnalysisVTable *vtable; - rz_vector_foreach(vtables, vtable) { + rz_vector_foreach (vtables, vtable) { rz_cons_printf(" %2s vtable 0x%" PFMT64x " @ +0x%" PFMT64x " size:+0x%" PFMT64x "\n", vtable->id, vtable->addr, vtable->offset, vtable->size); } rz_vector_free(vtables); @@ -423,7 +423,7 @@ static void analysis_class_print(RzAnalysis *analysis, const char *class_name) { if (methods) { RzAnalysisMethod *meth; - rz_vector_foreach(methods, meth) { + rz_vector_foreach (methods, meth) { rz_cons_printf(" %s @ 0x%" PFMT64x, meth->name, meth->addr); if (meth->vtable_offset >= 0) { rz_cons_printf(" (vtable + 0x%" PFMT64x ")\n", (ut64)meth->vtable_offset); diff --git a/librz/debug/debug.c b/librz/debug/debug.c index 9a4474f3a92..cb36b3f9194 100644 --- a/librz/debug/debug.c +++ b/librz/debug/debug.c @@ -1168,7 +1168,7 @@ RZ_API int rz_debug_continue_kill(RzDebug *dbg, int sig) { RzRegItem *ripc = rz_reg_get(dbg->reg, dbg->reg->name[RZ_REG_NAME_PC], RZ_REG_TYPE_GPR); RzVector *vreg = ht_up_find(dbg->session->registers, ripc->offset | (ripc->arena << 16), NULL); RzDebugChangeReg *reg; - rz_vector_foreach_prev(vreg, reg) { + rz_vector_foreach_prev (vreg, reg) { if (reg->cnum <= dbg->session->cnum) { continue; } @@ -1471,7 +1471,7 @@ RZ_API bool rz_debug_continue_back(RzDebug *dbg) { return false; } RzDebugChangeReg *reg; - rz_vector_foreach_prev(vreg, reg) { + rz_vector_foreach_prev (vreg, reg) { if (reg->cnum >= dbg->session->cnum) { continue; } diff --git a/librz/debug/dsession.c b/librz/debug/dsession.c index 5a8ed0ba00f..5ffc0b3fda9 100644 --- a/librz/debug/dsession.c +++ b/librz/debug/dsession.c @@ -254,7 +254,7 @@ static bool serialize_register_cb(void *db, const ut64 k, const void *v) { } pj_a(j); - rz_vector_foreach(vreg, reg) { + rz_vector_foreach (vreg, reg) { pj_o(j); pj_kN(j, "cnum", reg->cnum); pj_kn(j, "data", reg->data); @@ -282,7 +282,7 @@ static bool serialize_memory_cb(void *db, const ut64 k, const void *v) { } pj_a(j); - rz_vector_foreach(vmem, mem) { + rz_vector_foreach (vmem, mem) { pj_o(j); pj_kN(j, "cnum", mem->cnum); pj_kn(j, "data", mem->data); @@ -306,7 +306,7 @@ static void serialize_checkpoints(Sdb *db, RzVector /**/ *che RzListIter *iter; char tmpbuf[32]; - rz_vector_foreach(checkpoints, chkpt) { + rz_vector_foreach (checkpoints, chkpt) { // 0x={ // registers:{"":, ...}, // snaps:{"size":, "a":[]} diff --git a/librz/debug/p/debug_dmp.c b/librz/debug/p/debug_dmp.c index e27e7ad3e0f..cd15cf26c8d 100644 --- a/librz/debug/p/debug_dmp.c +++ b/librz/debug/p/debug_dmp.c @@ -206,7 +206,7 @@ static bool rz_debug_dmp_init(RzDebug *dbg, void **user) { ctx->windctx.target_thread.ethread = address; const ut64 current_thread_offset = ctx->windctx.is_64bit ? 8 : 4; ut64 *kprcb; - rz_vector_foreach(&ctx->KiProcessorBlock, kprcb) { + rz_vector_foreach (&ctx->KiProcessorBlock, kprcb) { const ut64 current_thread = winkd_read_ptr_at(&ctx->windctx, ctx->windctx.read_at_kernel_virtual, *kprcb + current_thread_offset); WindThread *thread = winkd_get_thread_at(&ctx->windctx, current_thread); if (thread && thread->uniqueid == target_thread->uniqueid) { @@ -239,7 +239,7 @@ static int rz_debug_dmp_attach(RzDebug *dbg, int pid) { } const ut64 current_thread_offset = ctx->windctx.is_64bit ? 8 : 4; ut64 *kprcb; - rz_vector_foreach_prev(&ctx->KiProcessorBlock, kprcb) { + rz_vector_foreach_prev (&ctx->KiProcessorBlock, kprcb) { const ut64 current_thread = winkd_read_ptr_at(&ctx->windctx, ctx->windctx.read_at_kernel_virtual, *kprcb + current_thread_offset); WindThread *thread = winkd_get_thread_at(&ctx->windctx, current_thread); if (!thread) { @@ -275,7 +275,7 @@ static RzList /**/ *rz_debug_dmp_pids(RzDebug *dbg, int pid) { const ut64 current_thread_offset = ctx->windctx.is_64bit ? 8 : 4; ut64 *kprcb; // Get currently running processes - rz_vector_foreach_prev(&ctx->KiProcessorBlock, kprcb) { + rz_vector_foreach_prev (&ctx->KiProcessorBlock, kprcb) { const ut64 current_thread = winkd_read_ptr_at(&ctx->windctx, ctx->windctx.read_at_kernel_virtual, *kprcb + current_thread_offset); ut64 current_process = winkd_read_ptr_at(&ctx->windctx, ctx->windctx.read_at_kernel_virtual, current_thread + ctx->kthread_process_offset); rz_vector_push(&procs, ¤t_process); @@ -297,7 +297,7 @@ static RzList /**/ *rz_debug_dmp_pids(RzDebug *dbg, int pid) { newpid->status = 's'; newpid->runnable = true; ut64 *process; - rz_vector_foreach(&procs, process) { + rz_vector_foreach (&procs, process) { if (*process == p->eprocess) { newpid->status = 'r'; } @@ -651,7 +651,7 @@ static bool debug_dmp_sync_registers(RzDebug *dbg, RzReg *reg, bool to_debugger) const ut64 current_thread_offset = ctx->is_64bit ? 8 : 4; ut64 *kprcb; - rz_vector_foreach(&dmp->KiProcessorBlock, kprcb) { + rz_vector_foreach (&dmp->KiProcessorBlock, kprcb) { const ut64 current_thread = winkd_read_ptr_at(ctx, ctx->read_at_kernel_virtual, *kprcb + current_thread_offset); if (current_thread != ctx->target_thread.ethread) { continue; diff --git a/librz/type/format.c b/librz/type/format.c index 1049dee6cd0..faf6763fade 100644 --- a/librz/type/format.c +++ b/librz/type/format.c @@ -2878,7 +2878,7 @@ static void base_type_to_format_unfold(const RzTypeDB *typedb, RZ_NONNULL RzBase switch (type->kind) { case RZ_BASE_TYPE_KIND_STRUCT: { RzTypeStructMember *memb; - rz_vector_foreach(&type->struct_data.members, memb) { + rz_vector_foreach (&type->struct_data.members, memb) { const char *membtype = type_to_identifier(typedb, memb->type); // Avoid infinite recursion in case of self-referential structures if (!membtype || !strcmp(membtype, type->name)) { @@ -2908,7 +2908,7 @@ static void base_type_to_format_unfold(const RzTypeDB *typedb, RZ_NONNULL RzBase // which is why it uses `0` character as a marker rz_strbuf_append(format, "0"); RzTypeUnionMember *memb; - rz_vector_foreach(&type->union_data.members, memb) { + rz_vector_foreach (&type->union_data.members, memb) { const char *membtype = type_to_identifier(typedb, memb->type); // Avoid infinite recursion in case of self-referential unions if (!membtype || !strcmp(membtype, type->name)) { diff --git a/librz/type/path.c b/librz/type/path.c index 7bed0df9fdc..572ad9f023b 100644 --- a/librz/type/path.c +++ b/librz/type/path.c @@ -133,7 +133,7 @@ static RZ_BORROW RzType *path_walker_parse_dot(RZ_NONNULL const RzTypeDB *typedb RzTypeStructMember *memb_it = NULL; RzType *cur_type = NULL; size_t cur_offset = -1; - rz_vector_foreach(&parent_btype->struct_data.members, memb_it) { + rz_vector_foreach (&parent_btype->struct_data.members, memb_it) { if (!strcmp(memb_it->name, tok)) { cur_type = memb_it->type; cur_offset = memb_it->offset; // in bytes @@ -248,7 +248,7 @@ static void collect_base_type_paths(const RzTypeDB *typedb, RzList /*struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { if (memb_offset == offset) { RzTypePath *tpath = rz_type_path_new(memb->type, rz_str_newf("%s.%s", prefix, memb->name)); if (tpath) { @@ -268,7 +268,7 @@ static void collect_base_type_paths(const RzTypeDB *typedb, RzList /*union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { char *newpath = rz_str_newf("%s.%s", prefix, memb->name); if (offset == 0) { RzTypePath *tpath = rz_type_path_new(memb->type, newpath); @@ -410,7 +410,7 @@ RZ_API ut64 rz_type_db_struct_member_packed_offset(RZ_NONNULL const RzTypeDB *ty } RzTypeStructMember *memb; ut64 result = 0; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { if (!strcmp(memb->name, member)) { return result; break; @@ -434,7 +434,7 @@ RZ_API ut64 rz_type_db_struct_member_offset(RZ_NONNULL const RzTypeDB *typedb, R return 0; } RzTypeStructMember *memb; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { if (!strcmp(memb->name, member)) { return memb->offset; } diff --git a/librz/type/serialize_types.c b/librz/type/serialize_types.c index 377bf4222d3..45dfb98ae13 100644 --- a/librz/type/serialize_types.c +++ b/librz/type/serialize_types.c @@ -381,7 +381,7 @@ static void save_struct(const RzTypeDB *typedb, Sdb *sdb, const RzBaseType *type int i = 0; RzTypeStructMember *member; - rz_vector_foreach(&type->struct_data.members, member) { + rz_vector_foreach (&type->struct_data.members, member) { // struct.name.param=type,offset,argsize char *member_sname = rz_str_sanitize_sdb_key(member->name); char *member_type = rz_type_as_string(typedb, member->type); @@ -429,7 +429,7 @@ static void save_union(const RzTypeDB *typedb, Sdb *sdb, const RzBaseType *type) int i = 0; RzTypeUnionMember *member; - rz_vector_foreach(&type->union_data.members, member) { + rz_vector_foreach (&type->union_data.members, member) { // union.name.arg1=type,offset,argsize char *member_sname = rz_str_sanitize_sdb_key(member->name); char *member_type = rz_type_as_string(typedb, member->type); @@ -478,7 +478,7 @@ static void save_enum(const RzTypeDB *typedb, Sdb *sdb, const RzBaseType *type) int i = 0; RzTypeEnumCase *cas; - rz_vector_foreach(&type->enum_data.cases, cas) { + rz_vector_foreach (&type->enum_data.cases, cas) { // enum.name.arg1=type,offset,??? char *case_sname = rz_str_sanitize_sdb_key(cas->name); sdb_set(sdb, diff --git a/librz/type/type.c b/librz/type/type.c index a0fba848219..8bc724b95ac 100644 --- a/librz/type/type.c +++ b/librz/type/type.c @@ -499,7 +499,7 @@ RZ_API RZ_BORROW const char *rz_type_db_enum_member_by_val(const RzTypeDB *typed return NULL; } RzTypeEnumCase *cas; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { if (cas->val == val) { return cas->name; } @@ -525,7 +525,7 @@ RZ_API int rz_type_db_enum_member_by_name(const RzTypeDB *typedb, RZ_NONNULL con } RzTypeEnumCase *cas; int result = -1; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { if (!strcmp(cas->name, member)) { result = cas->val; break; @@ -548,7 +548,7 @@ RZ_API RZ_OWN RzList /**/ *rz_type_db_find_enums_by_val(const RzTypeDB * RzBaseType *e; rz_list_foreach (enums, iter, e) { RzTypeEnumCase *cas; - rz_vector_foreach(&e->enum_data.cases, cas) { + rz_vector_foreach (&e->enum_data.cases, cas) { if (cas->val == val) { rz_list_append(result, rz_str_newf("%s.%s", e->name, cas->name)); } @@ -585,7 +585,7 @@ RZ_API RZ_OWN char *rz_type_db_enum_get_bitfield(const RzTypeDB *typedb, RZ_NONN continue; } RzTypeEnumCase *cas; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { if (cas->val == n) { res = cas->name; break; @@ -689,13 +689,13 @@ static ut64 struct_union_bitsize(const RzTypeDB *typedb, RZ_NONNULL RzBaseType * ut64 size = 0; if (btype->kind == RZ_BASE_TYPE_KIND_STRUCT) { RzTypeStructMember *memb; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { size += type_get_bitsize_recurse(typedb, memb->type, visited_btypes); } } else { RzTypeUnionMember *memb; // Union has the size of the maximum size of its elements - rz_vector_foreach(&btype->union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { size = RZ_MAX(type_get_bitsize_recurse(typedb, memb->type, visited_btypes), size); } } @@ -997,7 +997,7 @@ static char *type_as_pretty_string(const RzTypeDB *typedb, const RzType *type, c if (not_empty) { rz_strbuf_appendf(buf, "%s", multiline ? "\n" : " "); } - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { char *unfold = type_as_pretty_string(typedb, memb->type, memb->name, used_types, opts, unfold_level - 1, indent_level + 1); rz_strbuf_appendf(buf, "%s%s", unfold, separator); free(unfold); @@ -1016,7 +1016,7 @@ static char *type_as_pretty_string(const RzTypeDB *typedb, const RzType *type, c if (not_empty) { rz_strbuf_appendf(buf, "%s", multiline ? "\n" : " "); } - rz_vector_foreach(&btype->union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { char *unfold = type_as_pretty_string(typedb, memb->type, memb->name, used_types, opts, unfold_level - 1, indent_level + 1); rz_strbuf_appendf(buf, "%s%s", unfold, separator); free(unfold); @@ -1038,7 +1038,7 @@ static char *type_as_pretty_string(const RzTypeDB *typedb, const RzType *type, c if (not_empty) { rz_strbuf_appendf(buf, "%s", multiline ? "\n" : " "); } - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { for (int i = 0; i < indent; i++) { rz_strbuf_append(buf, "\t"); } diff --git a/librz/util/annotated_code.c b/librz/util/annotated_code.c index f25c32fc7ad..55f3695cc18 100644 --- a/librz/util/annotated_code.c +++ b/librz/util/annotated_code.c @@ -52,7 +52,7 @@ RZ_API RzPVector /**/ *rz_annotated_code_annotations_in(RzAn return NULL; } RzCodeAnnotation *annotation; - rz_vector_foreach(&code->annotations, annotation) { + rz_vector_foreach (&code->annotations, annotation) { if (offset >= annotation->start && offset < annotation->end) { rz_pvector_push(r, annotation); } @@ -66,7 +66,7 @@ RZ_API RzPVector /**/ *rz_annotated_code_annotations_range(R return NULL; } RzCodeAnnotation *annotation; - rz_vector_foreach(&code->annotations, annotation) { + rz_vector_foreach (&code->annotations, annotation) { if (start >= annotation->end || end < annotation->start) { continue; } diff --git a/librz/util/buf.c b/librz/util/buf.c index d5b02f1f7df..f1c69831242 100644 --- a/librz/util/buf.c +++ b/librz/util/buf.c @@ -155,7 +155,7 @@ static st64 buf_format(RzBuffer *dst, RzBuffer *src, const char *fmt, int n) { st64 res = 0; for (int i = 0; i < n; i++) { const BufFormatToken *tok; - rz_vector_foreach(&tokens, tok) { + rz_vector_foreach (&tokens, tok) { if (tok->type_size == 1) { ut8 tmp[8]; size_t nbytes = tok->repeat; diff --git a/librz/util/event.c b/librz/util/event.c index 4139f9740fd..66b07bcacc2 100644 --- a/librz/util/event.c +++ b/librz/util/event.c @@ -79,7 +79,7 @@ static bool del_hook(void *user, const ut64 k, const void *v) { RzEventCallbackHook *hook; size_t i; rz_return_val_if_fail(cbs, false); - rz_vector_enumerate(cbs, hook, i) { + rz_vector_enumerate (cbs, hook, i) { if (hook->handle == handle) { rz_vector_remove_at(cbs, i, NULL); break; @@ -114,7 +114,7 @@ RZ_API void rz_event_send(RzEvent *ev, int type, void *data) { // send to both the per-type callbacks and to the all_callbacks ev->incall = true; - rz_vector_foreach(&ev->all_callbacks, hook) { + rz_vector_foreach (&ev->all_callbacks, hook) { hook->cb(ev, type, hook->user, data); } ev->incall = false; @@ -122,14 +122,14 @@ RZ_API void rz_event_send(RzEvent *ev, int type, void *data) { RzVector *cbs = ht_up_find(ev->callbacks, (ut64)type, NULL); if (cbs) { ev->incall = true; - rz_vector_foreach(cbs, hook) { + rz_vector_foreach (cbs, hook) { hook->cb(ev, type, hook->user, data); } ev->incall = false; } RzEventCallbackHandle *unhook_handle; - rz_vector_foreach(&ev->pending_unhook, unhook_handle) { + rz_vector_foreach (&ev->pending_unhook, unhook_handle) { rz_event_unhook(ev, *unhook_handle); } rz_vector_clear(&ev->pending_unhook); diff --git a/librz/util/print.c b/librz/util/print.c index e6723f772bd..d4ec3c1821a 100644 --- a/librz/util/print.c +++ b/librz/util/print.c @@ -1424,7 +1424,7 @@ RZ_API RZ_OWN RzStrBuf *rz_print_colorize_asm_str(RZ_BORROW RzPrint *p, const Rz const char *color; RzAsmToken *tok; - rz_vector_foreach(toks->tokens, tok) { + rz_vector_foreach (toks->tokens, tok) { switch (tok->type) { default: rz_strbuf_free(out); diff --git a/librz/util/table.c b/librz/util/table.c index c968016bdcc..dee5a88ffd8 100644 --- a/librz/util/table.c +++ b/librz/util/table.c @@ -43,12 +43,12 @@ static void __table_adjust(RzTable *t) { RzTableRow *row; int length = 0; if (t->showHeader) { - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { int length = rz_str_len_utf8_ansi(col->name) + 1; col->width = length; } } - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { void **pitem; char *item; int ncol = 0; @@ -127,7 +127,7 @@ RZ_API void rz_table_free(RzTable *t) { static bool column_exists(RzTable *t, const char *name) { RzTableColumn *c; - rz_vector_foreach(t->cols, c) { + rz_vector_foreach (t->cols, c) { if (!strcmp(c->name, name)) { return true; } @@ -390,7 +390,7 @@ static int __strbuf_append_col_aligned_fancy(RzTable *t, RzStrBuf *sb, RzTableCo static void __computeTotal(RzTable *t) { RzTableRow *row; - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { void **pitem; char *item; int c = 0; @@ -435,7 +435,7 @@ RZ_API RZ_OWN char *rz_table_tofancystring(RZ_NONNULL RzTable *t) { const char *br_corner = useUtf8 ? (useUtf8Curvy ? RUNE_CURVE_CORNER_BR : RUNE_CORNER_BR) : "'"; __table_adjust(t); - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { __strbuf_append_col_aligned_fancy(t, sb, col, col->name); } int len = rz_str_len_utf8_ansi(rz_strbuf_get(sb)) - 1; @@ -448,7 +448,7 @@ RZ_API RZ_OWN char *rz_table_tofancystring(RZ_NONNULL RzTable *t) { } rz_strbuf_appendf(sb, "%s\n%s%s%s\n", v_line, l_intersect, h_line_str, rz_intersect); - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { void **pitem; char *item; int c = 0; @@ -467,7 +467,7 @@ RZ_API RZ_OWN char *rz_table_tofancystring(RZ_NONNULL RzTable *t) { char tmp[64]; __computeTotal(t); rz_strbuf_appendf(sb, "%s%s%s\n", l_intersect, h_line_str, rz_intersect); - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { char *num = col->total == -1 ? "" : sdb_itoa(col->total, tmp, 10); (void)__strbuf_append_col_aligned_fancy(t, sb, col, num); } @@ -543,7 +543,7 @@ RZ_API char *rz_table_tosimplestring(RzTable *t) { __table_adjust(t); int maxlen = 0; if (t->showHeader) { - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { int ll = __strbuf_append_col_aligned(sb, col, col->name, false); maxlen = RZ_MAX(maxlen, ll); } @@ -554,7 +554,7 @@ RZ_API char *rz_table_tosimplestring(RzTable *t) { free(l); } } - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { void **pitem; char *item; int c = 0; @@ -579,7 +579,7 @@ RZ_API char *rz_table_tosimplestring(RzTable *t) { free(l); } } - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { bool nopad = (col == rz_vector_tail(t->cols)); (void)__strbuf_append_col_aligned(sb, col, sdb_itoa(col->total, tmp, 10), nopad); } @@ -593,7 +593,7 @@ RZ_API char *rz_table_tocsv(RzTable *t) { RzTableColumn *col; if (t->showHeader) { const char *comma = ""; - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { if (strchr(col->name, ',')) { // TODO. escaped string? rz_strbuf_appendf(sb, "%s\"%s\"", comma, col->name); @@ -604,7 +604,7 @@ RZ_API char *rz_table_tocsv(RzTable *t) { } rz_strbuf_append(sb, "\n"); } - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { void **pitem; char *item; int c = 0; @@ -638,7 +638,7 @@ RZ_API RZ_OWN char *rz_table_tojson(RzTable *t) { PJ *pj = pj_new(); RzTableRow *row; pj_a(pj); - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { void **pitem; char *item; int c = 0; @@ -893,7 +893,7 @@ RZ_API int rz_table_column_nth(RzTable *t, const char *name) { RzTableColumn *col; ut32 n = 0; - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { if (!strcmp(name, col->name)) { return n; } @@ -967,7 +967,7 @@ RZ_API void rz_table_columns(RzTable *t, RzList /**/ *col_names) { } RzTableRow *row; - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { RzPVector *old_items = row->items; RzPVector *new_items = rz_pvector_new(free); @@ -1017,7 +1017,7 @@ RZ_API void rz_table_columns(RzTable *t, RzList /**/ *col_names) { // Free dropped columns RzTableColumn *col; i = 0; - rz_vector_foreach(old_cols, col) { + rz_vector_foreach (old_cols, col) { if (free_cols[i]) { rz_table_column_fini(col); } @@ -1360,7 +1360,7 @@ RZ_API RZ_OWN RzTable *rz_table_transpose(RZ_NONNULL RzTable *t) { } // column names to row heads - rz_vector_foreach(t->cols, col) { + rz_vector_foreach (t->cols, col) { rz_list_append(row_name, col->name); } @@ -1380,7 +1380,7 @@ RZ_API RZ_OWN RzTable *rz_table_transpose(RZ_NONNULL RzTable *t) { } if (transpose->rows) { - rz_vector_foreach(t->rows, row) { + rz_vector_foreach (t->rows, row) { if (!row) { RZ_LOG_WARN("Invalid row while doing transpose.\n"); continue; diff --git a/test/integration/test_types.h b/test/integration/test_types.h index 9f520261886..9d0a7dbe8d7 100644 --- a/test/integration/test_types.h +++ b/test/integration/test_types.h @@ -7,7 +7,7 @@ static inline bool has_enum_val(RzBaseType *btype, const char *name, int val) { int result = -1; RzTypeEnumCase *cas; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { if (!strcmp(cas->name, name)) { result = cas->val; break; @@ -18,7 +18,7 @@ static inline bool has_enum_val(RzBaseType *btype, const char *name, int val) { static inline bool has_enum_case(RzBaseType *btype, const char *name) { RzTypeEnumCase *cas; - rz_vector_foreach(&btype->enum_data.cases, cas) { + rz_vector_foreach (&btype->enum_data.cases, cas) { if (!strcmp(cas->name, name)) { return true; } @@ -28,7 +28,7 @@ static inline bool has_enum_case(RzBaseType *btype, const char *name) { static inline bool has_struct_member(RzBaseType *btype, const char *name) { RzTypeStructMember *memb; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { if (!strcmp(memb->name, name)) { return true; } @@ -38,7 +38,7 @@ static inline bool has_struct_member(RzBaseType *btype, const char *name) { static inline bool has_union_member(RzBaseType *btype, const char *name) { RzTypeUnionMember *memb; - rz_vector_foreach(&btype->union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { if (!strcmp(memb->name, name)) { return true; } @@ -48,7 +48,7 @@ static inline bool has_union_member(RzBaseType *btype, const char *name) { static inline bool has_union_member_type(const RzTypeDB *typedb, RzBaseType *btype, const char *name, const char *type) { RzTypeUnionMember *memb; - rz_vector_foreach(&btype->union_data.members, memb) { + rz_vector_foreach (&btype->union_data.members, memb) { if (!strcmp(memb->name, name)) { if (!strcmp(type, rz_type_as_string(typedb, memb->type))) { return true; @@ -60,7 +60,7 @@ static inline bool has_union_member_type(const RzTypeDB *typedb, RzBaseType *bty static inline bool has_struct_member_type(const RzTypeDB *typedb, RzBaseType *btype, const char *name, const char *type) { RzTypeStructMember *memb; - rz_vector_foreach(&btype->struct_data.members, memb) { + rz_vector_foreach (&btype->struct_data.members, memb) { if (!strcmp(memb->name, name)) { if (!strcmp(type, rz_type_as_string(typedb, memb->type))) { return true; diff --git a/test/unit/test_analysis_var.c b/test/unit/test_analysis_var.c index 43963744a13..428eada3bbc 100644 --- a/test/unit/test_analysis_var.c +++ b/test/unit/test_analysis_var.c @@ -13,7 +13,7 @@ static bool sanitize_instr_acc(void *user, const ut64 k, const void *v) { RzAnalysisVar *var = *it; RzAnalysisVarAccess *acc; bool found = false; - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { if (acc->offset == (st64)k) { found = true; break; @@ -31,7 +31,7 @@ static bool sanitize(RzAnalysisFunction *fcn) { rz_pvector_foreach (&fcn->vars, it) { RzAnalysisVar *var = *it; RzAnalysisVarAccess *acc; - rz_vector_foreach(&var->accesses, acc) { + rz_vector_foreach (&var->accesses, acc) { RzPVector *iaccs = ht_up_find(fcn->inst_vars, acc->offset, NULL); mu_assert("var refs instr but instr does not ref var", rz_pvector_contains(iaccs, var)); } diff --git a/test/unit/test_annotated_code.c b/test/unit/test_annotated_code.c index 0b39ef9da42..233f7c80ff9 100644 --- a/test/unit/test_annotated_code.c +++ b/test/unit/test_annotated_code.c @@ -117,7 +117,7 @@ static RzAnnotatedCode *get_hello_world(void) { RzVector /**/ *test_annotations; test_annotations = get_annotations_for_hello_world(); RzCodeAnnotation *annotation; - rz_vector_foreach(test_annotations, annotation) { + rz_vector_foreach (test_annotations, annotation) { rz_annotated_code_add_annotation(code, annotation); } @@ -191,7 +191,7 @@ static bool test_rz_annotated_code_add_annotation(void) { RzVector /**/ *test_annotations; test_annotations = get_some_code_annotation_for_add(); RzCodeAnnotation *annotation; - rz_vector_foreach(test_annotations, annotation) { + rz_vector_foreach (test_annotations, annotation) { rz_annotated_code_add_annotation(code, annotation); } @@ -215,7 +215,7 @@ static bool test_rz_annotated_code_annotations_in(void) { test_annotations = get_some_annotations_for_in(); RzCodeAnnotation *annotation; - rz_vector_foreach(test_annotations, annotation) { + rz_vector_foreach (test_annotations, annotation) { rz_annotated_code_add_annotation(code, annotation); } @@ -244,7 +244,7 @@ static bool test_rz_annotated_code_annotations_range(void) { RzVector /**/ *test_annotations; test_annotations = get_some_annotations_for_in(); RzCodeAnnotation *annotation; - rz_vector_foreach(test_annotations, annotation) { + rz_vector_foreach (test_annotations, annotation) { rz_annotated_code_add_annotation(code, annotation); } diff --git a/test/unit/test_debug.c b/test/unit/test_debug.c index 6534ef7c9d4..3491d790825 100644 --- a/test/unit/test_debug.c +++ b/test/unit/test_debug.c @@ -113,7 +113,7 @@ static int dbg_mock_attach(RzDebug *dbg, int pid) { static bool mock_isa_hwbp_at(DebugMockCtx *ctx, ut64 addr, int perm) { DebugMockHWBP *bp; - rz_vector_foreach(&ctx->hwbps, bp) { + rz_vector_foreach (&ctx->hwbps, bp) { if (bp->addr <= addr && bp->addr + bp->size > addr && (bp->perm & perm)) { return true; } diff --git a/test/unit/test_debug_session.c b/test/unit/test_debug_session.c index c36071e7eca..b3a22030ca1 100644 --- a/test/unit/test_debug_session.c +++ b/test/unit/test_debug_session.c @@ -115,7 +115,7 @@ static bool compare_registers_cb(void *user, const ut64 key, const void *value) mu_assert_eq(actual_vreg->len, expected_vreg->len, "vreg length"); size_t i; - rz_vector_enumerate(actual_vreg, actual_reg, i) { + rz_vector_enumerate (actual_vreg, actual_reg, i) { expected_reg = rz_vector_index_ptr(expected_vreg, i); mu_assert_eq(actual_reg->cnum, expected_reg->cnum, "cnum"); mu_assert_eq(actual_reg->data, expected_reg->data, "data"); @@ -133,7 +133,7 @@ static bool compare_memory_cb(void *user, const ut64 key, const void *value) { mu_assert_eq(actual_vmem->len, expected_vmem->len, "vmem length"); size_t i; - rz_vector_enumerate(actual_vmem, actual_mem, i) { + rz_vector_enumerate (actual_vmem, actual_mem, i) { expected_mem = rz_vector_index_ptr(expected_vmem, i); mu_assert_eq(actual_mem->cnum, expected_mem->cnum, "cnum"); mu_assert_eq(actual_mem->data, expected_mem->data, "data"); @@ -176,7 +176,7 @@ static bool test_session_load(void) { size_t i, chkpt_idx; RzDebugCheckpoint *chkpt, *ref_chkpt; mu_assert_eq(s->checkpoints->len, ref->checkpoints->len, "checkpoints length"); - rz_vector_enumerate(s->checkpoints, chkpt, chkpt_idx) { + rz_vector_enumerate (s->checkpoints, chkpt, chkpt_idx) { ref_chkpt = rz_vector_index_ptr(ref->checkpoints, chkpt_idx); // Registers for (i = 0; i < RZ_REG_TYPE_LAST; i++) { diff --git a/test/unit/test_serialize_analysis.c b/test/unit/test_serialize_analysis.c index bda9135a379..90b41b9db75 100644 --- a/test/unit/test_serialize_analysis.c +++ b/test/unit/test_serialize_analysis.c @@ -558,7 +558,7 @@ bool test_analysis_var_load() { mu_assert_eq(v->accesses.len, 3, "accesses count"); bool found[3] = { false, false, false }; RzAnalysisVarAccess *acc; - rz_vector_foreach(&v->accesses, acc) { + rz_vector_foreach (&v->accesses, acc) { if (acc->offset == 3 && acc->type == RZ_ANALYSIS_VAR_ACCESS_TYPE_READ && acc->reg_addend == 0 && !strcmp(acc->reg, "rax")) { found[0] = true; } else if (acc->offset == 13 && acc->type == (RZ_ANALYSIS_VAR_ACCESS_TYPE_READ | RZ_ANALYSIS_VAR_ACCESS_TYPE_WRITE) && acc->reg_addend == -13 && !strcmp(acc->reg, "rbx")) { @@ -1093,7 +1093,7 @@ bool test_analysis_hints_load() { const RzVector /**/ *hints = rz_analysis_addr_hints_at(analysis, addr); \ const RzAnalysisAddrHintRecord *record; \ bool found = false; \ - rz_vector_foreach(hints, record) { \ + rz_vector_foreach (hints, record) { \ if (record->type == RZ_ANALYSIS_ADDR_HINT_TYPE_##tp) { \ check; \ found = true; \ diff --git a/test/unit/test_tokens.c b/test/unit/test_tokens.c index f18cb06f732..42671945109 100644 --- a/test/unit/test_tokens.c +++ b/test/unit/test_tokens.c @@ -108,7 +108,7 @@ static bool test_rz_tokenize_generic_0_no_reg_profile(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(toks->tokens, it) { + rz_vector_foreach (toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -138,7 +138,7 @@ static bool test_rz_tokenize_generic_0(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(toks->tokens, it) { + rz_vector_foreach (toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -185,7 +185,7 @@ static bool test_rz_tokenize_generic_1(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(toks->tokens, it) { + rz_vector_foreach (toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -216,7 +216,7 @@ static bool test_rz_tokenize_generic_2(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(toks->tokens, it) { + rz_vector_foreach (toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -247,7 +247,7 @@ static bool test_rz_tokenize_generic_3(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(toks->tokens, it) { + rz_vector_foreach (toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -284,7 +284,7 @@ static bool test_rz_tokenize_generic_4(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(toks->tokens, it) { + rz_vector_foreach (toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -321,7 +321,7 @@ static bool test_rz_tokenize_custom_hexagon_0(void) { int i = 0; RzAsmToken *it; - rz_vector_foreach(op->asm_toks->tokens, it) { + rz_vector_foreach (op->asm_toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); @@ -362,7 +362,7 @@ static bool test_rz_tokenize_custom_hexagon_1(void) { mu_assert_eq(rz_vector_len(op->asm_toks->tokens), 13, "Number of generated tokens."); int i = 0; RzAsmToken *it; - rz_vector_foreach(op->asm_toks->tokens, it) { + rz_vector_foreach (op->asm_toks->tokens, it) { mu_assert_eq(it->start, tokens[i].start, "Token start"); mu_assert_eq(it->len, tokens[i].len, "Token length"); mu_assert_eq(it->type, tokens[i].type, "Token type"); diff --git a/test/unit/test_type.c b/test/unit/test_type.c index f9b7f9087d6..707946a39b1 100644 --- a/test/unit/test_type.c +++ b/test/unit/test_type.c @@ -1719,7 +1719,7 @@ bool test_offset_by_path_struct(void) { RzBaseType *btype = rz_type_get_base_type(typedb, ttype); mu_assert_notnull(btype, "btype get successful"); RzTypeStructMember *memb_it; - rz_vector_foreach(&btype->struct_data.members, memb_it) { + rz_vector_foreach (&btype->struct_data.members, memb_it) { if (!strcmp(memb_it->name, "a")) { memb_it->offset = 0; } else if (!strcmp(memb_it->name, "b")) { @@ -1775,7 +1775,7 @@ bool test_offset_by_path_array(void) { btype = rz_type_get_base_type(typedb, ttype); mu_assert_notnull(btype, "btype get successful"); RzTypeStructMember *memb_it; - rz_vector_foreach(&btype->struct_data.members, memb_it) { + rz_vector_foreach (&btype->struct_data.members, memb_it) { if (!strcmp(memb_it->name, "b")) { memb_it->offset = 4; } @@ -1790,7 +1790,7 @@ bool test_offset_by_path_array(void) { btype = rz_type_get_base_type(typedb, ttype); mu_assert_notnull(btype, "btype get successful"); - rz_vector_foreach(&btype->struct_data.members, memb_it) { + rz_vector_foreach (&btype->struct_data.members, memb_it) { if (!strcmp(memb_it->name, "harr")) { memb_it->offset = 4; } diff --git a/test/unit/test_vector.c b/test/unit/test_vector.c index d89b69f34fc..0e1d4e91f7b 100644 --- a/test/unit/test_vector.c +++ b/test/unit/test_vector.c @@ -742,7 +742,7 @@ static bool test_vector_foreach(void) { int i = 1; ut32 *it; int acc[5] = { 0 }; - rz_vector_foreach(&v, it) { + rz_vector_foreach (&v, it) { mu_assert_eq(acc[*it], 0, "unset acc element"); acc[*it] = i++; } @@ -753,7 +753,7 @@ static bool test_vector_foreach(void) { int acc_prev[5] = { 0 }; i = 5; - rz_vector_foreach_prev(&v, it) { + rz_vector_foreach_prev (&v, it) { mu_assert_eq(acc_prev[*it], 0, "unset acc_prev element"); acc_prev[*it] = i++; }