portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inline rz_list_iter_set_data() and shorten it to rz_list_set_val() (#6131)

Browse source
This commit is contained in:
Khairul Azhar Kasmiran 2026-04-02 06:04:54 +08:00 committed by GitHub
parent 7ad49c41c2
commit 815c86a8f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
librz/arch/p/parse/parse_arm_pseudo.c
View file

@ -197,7 +197,7 @@ RzList /*<char *>*/ *arm_tokenize(const char *assembly, size_t length) {
RzListIter *it;
rz_list_foreach (tokens, it, buf) {
char *repl = rz_str_replace(buf, ",", comma_replace, 1);
rz_list_iter_set_data(it, repl);
rz_list_set_val(it, repl);
}
}

2
librz/arch/p/parse/parse_dalvik_pseudo.c
View file

@ -246,7 +246,7 @@ RzList /*<char *>*/ *dalvik_tokenize(const char *assembly, size_t length) {
RzListIter *it;
rz_list_foreach (tokens, it, buf) {
char *repl = rz_str_replace(buf, ",", comma_replace, 1);
rz_list_iter_set_data(it, repl);
rz_list_set_val(it, repl);
}
}

2
librz/arch/p/parse/parse_sh_pseudo.c
View file

@ -163,7 +163,7 @@ RzList /*<char *>*/ *sh_tokenize(const char *assembly, size_t length) {
RzListIter *it;
rz_list_foreach (tokens, it, buf) {
char *repl = rz_str_replace(buf, ",", " + ", 1);
rz_list_iter_set_data(it, repl);
rz_list_set_val(it, repl);
}
return tokens;

2
librz/arch/p_gnu/parse/parse_z80_gnu.c
View file

@ -142,7 +142,7 @@ RzList /*<char *>*/ *z80_tokenize(const char *assembly, size_t length) {
RzListIter *it;
rz_list_foreach (tokens, it, buf) {
char *repl = rz_str_replace(buf, ",", comma_replace, 1);
rz_list_iter_set_data(it, repl);
rz_list_set_val(it, repl);
}
}

2
librz/bin/format/pyc/marshal.c
View file

@ -1285,7 +1285,7 @@ static pyc_object *get_object(RzBinPycObj *pyc, RzBuffer *buffer) {
void *p = rz_list_val(ref_idx);
free_object(p);
p = copy_object(ret);
rz_list_iter_set_data(ref_idx, p);
rz_list_set_val(ref_idx, p);
}
return ret;
}

5
librz/include/rz_list.h
View file

@ -75,6 +75,10 @@ static inline RZ_BORROW void *rz_list_val(RZ_NONNULL const RzListIter *iter) {
return iter->val;
}
static inline void rz_list_set_val(RZ_NONNULL RzListIter *iter, RZ_NULLABLE void *val) {
iter->val = val;
}
static inline bool rz_list_has_prev(RZ_NONNULL const RzListIter *iter) {
return iter->prev != NULL;
}
@ -90,7 +94,6 @@ RZ_API RZ_OWN RzList *rz_list_new_from_iterator(RZ_BORROW RZ_NONNULL RzIterator
RZ_API RZ_BORROW void *rz_list_iter_get_prev_data(RZ_NONNULL RzListIter *iter);
RZ_API RZ_BORROW void *rz_list_iter_get_next_data(RZ_NONNULL RzListIter *iter);
RZ_API ut32 rz_list_set_n(RZ_NONNULL RzList *list, ut32 n, RZ_NONNULL void *data);
RZ_API bool rz_list_iter_set_data(RZ_NONNULL RzListIter *iter, RZ_NULLABLE void *data);
RZ_API bool rz_list_iter_swap_data(RZ_NONNULL RzListIter *iter0, RZ_NONNULL RzListIter *iter1);
RZ_API RZ_BORROW RzListIter *rz_list_append(RZ_NONNULL RzList *list, RZ_NONNULL void *data);
RZ_API RZ_BORROW RzListIter *rz_list_prepend(RZ_NONNULL RzList *list, RZ_NONNULL void *data);

2
librz/io/p/io_ar.c
View file

@ -48,7 +48,7 @@ static RzList /*<RzIODesc *>*/ *rz_io_ar_open_many(RzIO *io, const char *file, i
rz_list_free(list_fds);
return NULL;
}
rz_list_iter_set_data(it, NULL);
rz_list_set_val(it, NULL);
}
rz_list_free(all);
return list_fds;

6
librz/sign/create.c
View file

@ -293,7 +293,7 @@ static bool flirt_node_shorten_and_insert(const RzFlirtNode *root, RzFlirtNode *
rz_list_sort(child->child_list, (RzListComparator)flirt_compare_node, NULL);
} else if (node->length == i) {
// partial pattern match but matches the node
rz_list_iter_set_data(it, node);
rz_list_set_val(it, node);
flirt_node_shorten_pattern(child, i);
if (!rz_list_append(node->child_list, child)) {
RZ_LOG_ERROR("FLIRT: cannot append child to optimized list.\n");
@ -307,7 +307,7 @@ static bool flirt_node_shorten_and_insert(const RzFlirtNode *root, RzFlirtNode *
rz_sign_flirt_node_free(node);
return false;
}
rz_list_iter_set_data(it, middle_node);
rz_list_set_val(it, middle_node);
if (!rz_list_append(middle_node->child_list, child)) {
RZ_LOG_ERROR("FLIRT: cannot append child to optimized list.\n");
rz_sign_flirt_node_free(node);
@ -351,7 +351,7 @@ bool flirt_node_optimize(RzFlirtNode *root) {
RzListIter *it;
RzFlirtNode *child;
rz_list_foreach (childs, it, child) {
rz_list_iter_set_data(it, NULL);
rz_list_set_val(it, NULL);
if (!flirt_node_shorten_and_insert(root, child)) {
goto fail;
}

10
librz/util/list.c
View file

@ -31,16 +31,6 @@ RZ_API RZ_BORROW void *rz_list_iter_get_next_data(RZ_NONNULL RzListIter *iter) {
return n->val;
}
/**
* \brief Sets the value stored in the list iterator and returns true if succeeds
*
**/
RZ_API bool rz_list_iter_set_data(RZ_NONNULL RzListIter *iter, RZ_NULLABLE void *data) {
rz_return_val_if_fail(iter, false);
iter->val = data;
return true;
}
/**
* \brief swaps the data held by two iterators and returns true if succeeds
*

2
subprojects/rzgdb/src/gdbclient/xml.c
View file

@ -885,7 +885,7 @@ static RzList *_extract_regs(char *regstr, RzList *flags, char *pc_alias) {
for (i = regnum - rz_list_length(regs); i > 0; i--) {
// temporary placeholder reg. we trust the xml is correct and this will be replaced.
rz_list_push(regs, tmpreg);
rz_list_iter_set_data(rz_list_tail(regs), NULL);
rz_list_set_val(rz_list_tail(regs), NULL);
}
rz_list_push(regs, tmpreg);
} else {