X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=log.c;h=de7360398456d2f087155f712281b6ed8ee53360;hb=b3f83fda31bfeef63b0ed5610c7b2986ad80dcc5;hp=0d8bbfa5314bce0b4b7f4f35f32b4d95527b1749;hpb=ef3a66299ade1bc41090d0b6d24c21b6bcfad571;p=libsigrokdecode.git
diff --git a/log.c b/log.c
index 0d8bbfa..de73603 100644
--- a/log.c
+++ b/log.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -130,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.5.2
+ */
+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.
*
@@ -157,15 +178,15 @@ static int srd_logv(void *cb_data, int loglevel, const char *format,
/* This specific log callback doesn't need the void pointer data. */
(void)cb_data;
- /* Only output messages of at least the selected loglevel(s). */
- if (loglevel > cur_loglevel)
- return SRD_OK;
+ (void)loglevel;
if (fputs("srd: ", stderr) < 0
|| g_vfprintf(stderr, format, args) < 0
|| putc('\n', stderr) < 0)
return SRD_ERR;
+ fflush(stderr);
+
return SRD_OK;
}
@@ -175,6 +196,10 @@ SRD_PRIV int srd_log(int loglevel, const char *format, ...)
int ret;
va_list args;
+ /* Only output messages of at least the selected loglevel(s). */
+ if (loglevel > cur_loglevel)
+ return SRD_OK;
+
va_start(args, format);
ret = srd_log_cb(srd_log_cb_data, loglevel, format, args);
va_end(args);