X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=log.c;h=459a5c10be9023ad2422a4c35a015abfd79f95ee;hp=49a18eb8eb925ec7f6b4b65a6b980ea860f8ff81;hb=a27981c145cd9a3709673339dc455f3a0d5c3745;hpb=8c664ca2d7b4faffa7b3dbeb3b9e491976c24eee
diff --git a/log.c b/log.c
index 49a18eb..459a5c1 100644
--- a/log.c
+++ b/log.c
@@ -14,14 +14,15 @@
* 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 "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "sigrokdecode-internal.h"
+#include
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include
#include
+#include
/**
* @file
@@ -38,27 +39,20 @@
*/
/* Currently selected libsigrokdecode loglevel. Default: SRD_LOG_WARN. */
-static int srd_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */
+static int cur_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */
/* Function prototype. */
static int srd_logv(void *cb_data, int loglevel, const char *format,
va_list args);
/* Pointer to the currently selected log callback. Default: srd_logv(). */
-static srd_log_callback_t srd_log_callback = srd_logv;
+static srd_log_callback srd_log_cb = srd_logv;
/*
* Pointer to private data that can be passed to the log callback.
* This can be used (for example) by C++ GUIs to pass a "this" pointer.
*/
-static void *srd_log_callback_data = NULL;
-
-/* Log domain (a short string that is used as prefix for all messages). */
-/** @cond PRIVATE */
-#define LOGDOMAIN_MAXLEN 30
-#define LOGDOMAIN_DEFAULT "srd: "
-/** @endcond */
-static char srd_log_domain[LOGDOMAIN_MAXLEN + 1] = LOGDOMAIN_DEFAULT;
+static void *srd_log_cb_data = NULL;
/**
* Set the libsigrokdecode loglevel.
@@ -85,7 +79,7 @@ SRD_API int srd_log_loglevel_set(int loglevel)
return SRD_ERR_ARG;
}
- srd_loglevel = loglevel;
+ cur_loglevel = loglevel;
srd_dbg("libsigrokdecode loglevel set to %d.", loglevel);
@@ -101,52 +95,7 @@ SRD_API int srd_log_loglevel_set(int loglevel)
*/
SRD_API int srd_log_loglevel_get(void)
{
- return srd_loglevel;
-}
-
-/**
- * Set the libsigrokdecode logdomain string.
- *
- * @param logdomain The string to use as logdomain for libsigrokdecode log
- * messages from now on. Must not be NULL. The maximum
- * length of the string is 30 characters (this does not
- * include the trailing NUL-byte). Longer strings are
- * silently truncated.
- * In order to not use a logdomain, pass an empty string.
- * The function makes its own copy of the input string, i.e.
- * the caller does not need to keep it around.
- *
- * @return SRD_OK upon success, SRD_ERR_ARG upon invalid logdomain.
- *
- * @since 0.1.0
- */
-SRD_API int srd_log_logdomain_set(const char *logdomain)
-{
- if (!logdomain) {
- srd_err("log: %s: logdomain was NULL", __func__);
- return SRD_ERR_ARG;
- }
-
- /* TODO: Error handling. */
- snprintf((char *)&srd_log_domain, LOGDOMAIN_MAXLEN, "%s", logdomain);
-
- srd_dbg("Log domain set to '%s'.", (const char *)&srd_log_domain);
-
- return SRD_OK;
-}
-
-/**
- * Get the currently configured libsigrokdecode logdomain.
- *
- * @return A copy of the currently configured libsigrokdecode logdomain
- * string. The caller is responsible for g_free()ing the string when
- * it is no longer needed.
- *
- * @since 0.1.0
- */
-SRD_API char *srd_log_logdomain_get(void)
-{
- return g_strdup((const char *)&srd_log_domain);
+ return cur_loglevel;
}
/**
@@ -163,9 +112,9 @@ SRD_API char *srd_log_logdomain_get(void)
*
* @return SRD_OK upon success, SRD_ERR_ARG upon invalid arguments.
*
- * @since 0.1.0
+ * @since 0.3.0
*/
-SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data)
+SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data)
{
if (!cb) {
srd_err("log: %s: cb was NULL", __func__);
@@ -174,8 +123,8 @@ SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data)
/* Note: 'cb_data' is allowed to be NULL. */
- srd_log_callback = cb;
- srd_log_callback_data = cb_data;
+ srd_log_cb = cb;
+ srd_log_cb_data = cb_data;
return SRD_OK;
}
@@ -183,7 +132,7 @@ SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data)
/**
* Set the libsigrokdecode log callback to the default built-in one.
*
- * Additionally, the internal 'srd_log_callback_data' pointer is set to NULL.
+ * Additionally, the internal 'srd_log_cb_data' pointer is set to NULL.
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*
@@ -195,8 +144,8 @@ SRD_API int srd_log_callback_set_default(void)
* Note: No log output in this function, as it should safely work
* even if the currently set log callback is buggy/broken.
*/
- srd_log_callback = srd_logv;
- srd_log_callback_data = NULL;
+ srd_log_cb = srd_logv;
+ srd_log_cb_data = NULL;
return SRD_OK;
}
@@ -204,101 +153,33 @@ SRD_API int srd_log_callback_set_default(void)
static int srd_logv(void *cb_data, int loglevel, const char *format,
va_list args)
{
- int ret;
-
/* 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 > srd_loglevel)
- return SRD_OK; /* TODO? */
-
- if (srd_log_domain[0] != '\0')
- fprintf(stderr, "%s", srd_log_domain);
- ret = vfprintf(stderr, format, args);
- fprintf(stderr, "\n");
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_log(int loglevel, const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_callback(srd_log_callback_data, loglevel, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_spew(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_callback(srd_log_callback_data, SRD_LOG_SPEW,
- format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_dbg(const char *format, ...)
-{
- int ret;
- va_list args;
+ (void)loglevel;
- va_start(args, format);
- ret = srd_log_callback(srd_log_callback_data, SRD_LOG_DBG,
- format, args);
- va_end(args);
+ if (fputs("srd: ", stderr) < 0
+ || g_vfprintf(stderr, format, args) < 0
+ || putc('\n', stderr) < 0)
+ return SRD_ERR;
- return ret;
-}
+ fflush(stderr);
-/** @private */
-SRD_PRIV int srd_info(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_callback(srd_log_callback_data, SRD_LOG_INFO,
- format, args);
- va_end(args);
-
- return ret;
+ return SRD_OK;
}
/** @private */
-SRD_PRIV int srd_warn(const char *format, ...)
+SRD_PRIV int srd_log(int loglevel, const char *format, ...)
{
int ret;
va_list args;
- va_start(args, format);
- ret = srd_log_callback(srd_log_callback_data, SRD_LOG_WARN,
- format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_err(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_callback(srd_log_callback_data, SRD_LOG_ERR,
- format, args);
+ ret = srd_log_cb(srd_log_cb_data, loglevel, format, args);
va_end(args);
return ret;