From 34933bc525ca22d0dca207c385123a638a2fe21e Mon Sep 17 00:00:00 2001 From: Premade <128969155+PremadeS@users.noreply.github.com> Date: Fri, 10 Oct 2025 21:55:10 +0500 Subject: [PATCH] refactor: rz_mark_foreach_glob to rz_mark_foreach_regex (#5446) --- librz/core/cmd/cmd_mark.c | 2 +- librz/include/rz_mark.h | 2 +- librz/mark/mark.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/librz/core/cmd/cmd_mark.c b/librz/core/cmd/cmd_mark.c index 32f22bb58a..63ef1addd8 100644 --- a/librz/core/cmd/cmd_mark.c +++ b/librz/core/cmd/cmd_mark.c @@ -44,7 +44,7 @@ static int mark_to_mark(RzCore *core, const char *glob) { rz_return_val_if_fail(glob, 0); glob = rz_str_trim_head_ro(glob); struct mark_to_mark_t u = { .next = UT64_MAX, .offset = core->offset }; - rz_mark_foreach_glob(core->marks, glob, mark_to_mark_foreach, &u); + rz_mark_foreach_regex(core->marks, glob, mark_to_mark_foreach, &u); if (u.next != UT64_MAX && u.next > core->offset) { return u.next - core->offset; } diff --git a/librz/include/rz_mark.h b/librz/include/rz_mark.h index c6f7c5cb6b..65a2d03e26 100644 --- a/librz/include/rz_mark.h +++ b/librz/include/rz_mark.h @@ -70,7 +70,7 @@ RZ_API void rz_mark_unset_all(RZ_NONNULL RzMark *b); RZ_API int rz_mark_unset_glob(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob); RZ_API int rz_mark_count(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob); RZ_API void rz_mark_foreach(RZ_NONNULL RzMark *b, RZ_NONNULL RzMarkItemCb cb, RZ_NULLABLE void *user); -RZ_API void rz_mark_foreach_glob(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob, RZ_NONNULL RzMarkItemCb cb, RZ_NULLABLE void *user); +RZ_API void rz_mark_foreach_regex(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob, RZ_NONNULL RzMarkItemCb cb, RZ_NULLABLE void *user); /* serialize */ diff --git a/librz/mark/mark.c b/librz/mark/mark.c index fe3eccf292..c6478bc948 100644 --- a/librz/mark/mark.c +++ b/librz/mark/mark.c @@ -435,15 +435,15 @@ RZ_API void rz_mark_foreach(RZ_NONNULL RzMark *b, RZ_NONNULL RzMarkItemCb cb, RZ } /** - * \brief Iterate through all mark items matching a glob pattern. + * \brief Iterate through all mark items matching a regex pattern. * * \param b The mark container. - * \param glob Glob/Regex pattern to filter mark names. + * \param regex Regex pattern to filter mark names. * \param cb Callback function to invoke for each matching mark item. * \param user User-provided data passed to the callback. */ -RZ_API void rz_mark_foreach_glob(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob, RZ_NONNULL RzMarkItemCb cb, RZ_NULLABLE void *user) { - FOREACH_BODY(!glob || rz_str_glob(bi->name, glob)); +RZ_API void rz_mark_foreach_regex(RZ_NONNULL RzMark *b, RZ_NONNULL const char *regex, RZ_NONNULL RzMarkItemCb cb, RZ_NULLABLE void *user) { + FOREACH_BODY(!regex || rz_str_glob(bi->name, regex)); } struct unset_off_foreach_t { @@ -514,7 +514,7 @@ static bool unset_foreach(RzMarkItem *bi, void *user) { RZ_API int rz_mark_unset_glob(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob) { rz_return_val_if_fail(b, -1); struct unset_foreach_t u = { .b = b, .n = 0 }; - rz_mark_foreach_glob(b, glob, unset_foreach, &u); + rz_mark_foreach_regex(b, glob, unset_foreach, &u); return u.n; } @@ -597,6 +597,6 @@ static bool mark_count_foreach(RzMarkItem *fi, void *user) { RZ_API int rz_mark_count(RZ_NONNULL RzMark *b, RZ_NONNULL const char *glob) { int count = 0; rz_return_val_if_fail(b, -1); - rz_mark_foreach_glob(b, glob, mark_count_foreach, &count); + rz_mark_foreach_regex(b, glob, mark_count_foreach, &count); return count; }