From 9e6a430ee76cc9224f26529a9ff6632b7a0ca779 Mon Sep 17 00:00:00 2001 From: Rot127 Date: Sun, 21 Apr 2024 08:47:02 -0500 Subject: [PATCH] Rename bind -> str --- librz/core/core.c | 6 +++--- librz/include/rz_core.h | 6 +++--- librz/include/rz_util/rz_log.h | 2 +- librz/util/log.c | 2 +- test/unit/test_log.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/librz/core/core.c b/librz/core/core.c index d3456157a63..fc22f061540 100644 --- a/librz/core/core.c +++ b/librz/core/core.c @@ -106,15 +106,15 @@ RZ_API void rz_core_notify_error(RZ_NONNULL RzCore *core, RZ_NONNULL const char va_end(args); } -RZ_API void rz_core_notify_begin_bind(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text) { +RZ_API void rz_core_notify_begin_str(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text) { rz_core_notify_begin(core, "%s", text); } -RZ_API void rz_core_notify_done_bind(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text) { +RZ_API void rz_core_notify_done_str(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text) { rz_core_notify_done(core, "%s", text); } -RZ_API void rz_core_notify_error_bind(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text) { +RZ_API void rz_core_notify_error_str(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text) { rz_core_notify_error(core, "%s", text); } diff --git a/librz/include/rz_core.h b/librz/include/rz_core.h index 57a11acfa88..738a656e492 100644 --- a/librz/include/rz_core.h +++ b/librz/include/rz_core.h @@ -398,9 +398,9 @@ RZ_API void rz_core_notify_begin(RZ_NONNULL RzCore *core, RZ_NONNULL const char RZ_API void rz_core_notify_done(RZ_NONNULL RzCore *core, RZ_NONNULL const char *format, ...) RZ_PRINTF_CHECK(2, 3); RZ_API void rz_core_notify_error(RZ_NONNULL RzCore *core, RZ_NONNULL const char *format, ...) RZ_PRINTF_CHECK(2, 3); -RZ_API void rz_core_notify_begin_bind(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text); -RZ_API void rz_core_notify_done_bind(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text); -RZ_API void rz_core_notify_error_bind(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text); +RZ_API void rz_core_notify_begin_str(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text); +RZ_API void rz_core_notify_done_str(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text); +RZ_API void rz_core_notify_error_str(RZ_NONNULL RzCore *core, RZ_NONNULL const char *text); /** * \brief APIs to handle Visual Gadgets diff --git a/librz/include/rz_util/rz_log.h b/librz/include/rz_util/rz_log.h index 21d7709d277..fef8e9bb7ff 100644 --- a/librz/include/rz_util/rz_log.h +++ b/librz/include/rz_util/rz_log.h @@ -84,7 +84,7 @@ RZ_API void rz_log(const char *funcname, const char *filename, RZ_API void rz_vlog(const char *funcname, const char *filename, ut32 lineno, RzLogLevel level, const char *tag, const char *fmtstr, va_list args); -RZ_API void rz_log_bind(const char *funcname, const char *filename, +RZ_API void rz_log_str(const char *funcname, const char *filename, ut32 lineno, RzLogLevel level, const char *tag, const char *msg); #ifdef __cplusplus diff --git a/librz/util/log.c b/librz/util/log.c index 486109306e6..60e1aa9b27f 100644 --- a/librz/util/log.c +++ b/librz/util/log.c @@ -284,7 +284,7 @@ RZ_API void rz_log(const char *funcname, const char *filename, * \param tag A string placed at the beginning of the log message. If NULL, the log level is used. * \param msg The log message. */ -RZ_API void rz_log_bind(const char *funcname, const char *filename, +RZ_API void rz_log_str(const char *funcname, const char *filename, ut32 lineno, RzLogLevel level, const char *tag, const char *msg) { rz_log(funcname, filename, lineno, level, tag, "%s", msg); } diff --git a/test/unit/test_log.c b/test/unit/test_log.c index 144ff9cfa35..692dcc8d400 100644 --- a/test/unit/test_log.c +++ b/test/unit/test_log.c @@ -40,7 +40,7 @@ bool test_log_binding(void) { rz_log_del_callback((RzLogCallback)large_check); rz_log_del_callback((RzLogCallback)small_check); rz_log_add_callback((RzLogCallback)bind_check); - rz_log_bind("func", "file", 1, RZ_LOGLVL_ERROR, NULL, "3"); + rz_log_str("func", "file", 1, RZ_LOGLVL_ERROR, NULL, "3"); mu_end; }