From c7b211b18466c69df976a6d71f1c8ba30145f14c Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Wed, 15 Aug 2018 23:09:11 +0200 Subject: [PATCH] log: add a public srd_log_callback_get() API routine Allow applications to query the currently registered log callback. So they can either restore the previously registered routine, or register another routine _and_ log to the previously registered routine as well. --- libsigrokdecode.h | 1 + log.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/libsigrokdecode.h b/libsigrokdecode.h index deba470..55620a7 100644 --- a/libsigrokdecode.h +++ b/libsigrokdecode.h @@ -367,6 +367,7 @@ typedef int (*srd_log_callback)(void *cb_data, int loglevel, const char *format, va_list args); SRD_API int srd_log_loglevel_set(int loglevel); SRD_API int srd_log_loglevel_get(void); +SRD_API int srd_log_callback_get(srd_log_callback *cb, void **cb_data); SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data); SRD_API int srd_log_callback_set_default(void); diff --git a/log.c b/log.c index 459a5c1..b5402f8 100644 --- a/log.c +++ b/log.c @@ -129,6 +129,28 @@ SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data) return SRD_OK; } +/** + * Get the libsigrokdecode log callback routine and callback data. + * + * @param[out] cb Pointer to a function pointer to receive the log callback + * function. Optional, can be NULL. + * @param[out] cb_data Pointer to a void pointer to receive the log callback's + * additional arguments. Optional, can be NULL. + * + * @return SRD_OK upon success. + * + * @since 0.6.0 + */ +SRD_API int srd_log_callback_get(srd_log_callback *cb, void **cb_data) +{ + if (cb) + *cb = srd_log_cb; + if (cb_data) + *cb_data = srd_log_cb_data; + + return SRD_OK; +} + /** * Set the libsigrokdecode log callback to the default built-in one. * -- 2.30.2