Add a new sr_log_callback_get() API call.

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 3690ca0b67e5260a5ad18a45b650d69de33863da..722b8b57c3e664c602f1e8b5ebcbb888cd5c83c2 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -67,6 +67,7 @@ SR_API int sr_log_loglevel_set(int loglevel);
 SR_API int sr_log_loglevel_get(void);
 SR_API int sr_log_callback_set(sr_log_callback cb, void *cb_data);
 SR_API int sr_log_callback_set_default(void);
+SR_API int sr_log_callback_get(sr_log_callback *cb, void **cb_data);
 
 /*--- device.c --------------------------------------------------------------*/
 

diff --git a/src/log.c b/src/log.c
index caffa2a2d4900f8532b82455288a748aea6b4ba7..701df645e76cf296dfe7c760368704668575a2d5 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -160,6 +160,28 @@ SR_API int sr_log_callback_set_default(void)
        return SR_OK;
 }
 
+/**
+ * Get the libsigrok 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 SR_OK upon success.
+ *
+ * @since 0.6.0
+ */
+SR_API int sr_log_callback_get(sr_log_callback *cb, void **cb_data)
+{
+       if (cb)
+               *cb = sr_log_cb;
+       if (cb_data)
+               *cb_data = sr_log_cb_data;
+
+       return SR_OK;
+}
+
 static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args)
 {
        uint64_t elapsed_us, minutes;