Introduce standard cleanup helper

[libsigrok.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index e12c8f4ccaa6a63186dfd6d4958047d676908a00..3d65cc4e20bb755d7550f87b85959990976916c9 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -18,8 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <glib/gprintf.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -55,13 +57,6 @@ static sr_log_callback sr_log_cb = sr_logv;
  */
 static void *sr_log_cb_data = NULL;
 
-/* Log domain (a short string that is used as prefix for all messages). */
-/** @cond PRIVATE */
-#define LOGDOMAIN_MAXLEN 30
-#define LOGDOMAIN_DEFAULT "sr: "
-/** @endcond */
-static char sr_log_domain[LOGDOMAIN_MAXLEN + 1] = LOGDOMAIN_DEFAULT;
-
 /** @cond PRIVATE */
 #define LOGLEVEL_TIMESTAMP SR_LOG_DBG
 /** @endcond */
@@ -113,54 +108,6 @@ SR_API int sr_log_loglevel_get(void)
        return cur_loglevel;
 }
 
-/**
- * Set the libsigrok logdomain string.
- *
- * @param logdomain The string to use as logdomain for libsigrok 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
- *                  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.
- *
- * @retval SR_OK upon success.
- * @retval SR_ERR_ARG @a logdomain was NULL.
- * @retval SR_ERR @a logdomain was truncated.
- *
- * @since 0.1.0
- */
-SR_API int sr_log_logdomain_set(const char *logdomain)
-{
-       size_t len;
-
-       if (!logdomain) {
-               sr_err("%s: logdomain was NULL", __func__);
-               return SR_ERR_ARG;
-       }
-
-       len = g_strlcpy(sr_log_domain, logdomain, sizeof sr_log_domain);
-
-       sr_dbg("Log domain set to '%s'.", sr_log_domain);
-
-       return (len < sizeof sr_log_domain) ? SR_OK : SR_ERR;
-}
-
-/**
- * Get the currently configured libsigrok logdomain.
- *
- * @return A copy of the currently configured libsigrok logdomain
- *         string. The caller is responsible for g_free()ing the string when
- *         it is no longer needed.
- *
- * @since 0.1.0
- */
-SR_API char *sr_log_logdomain_get(void)
-{
-       return g_strdup(sr_log_domain);
-}
-
 /**
  * Set the libsigrok log callback to the specified function.
  *
@@ -216,6 +163,7 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
 {
        uint64_t elapsed_us, minutes;
        unsigned int rest_us, seconds, microseconds;
+       int ret;
 
        /* This specific log callback doesn't need the void pointer data. */
        (void)cb_data;
@@ -232,15 +180,14 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
                seconds = rest_us / G_TIME_SPAN_SECOND;
                microseconds = rest_us % G_TIME_SPAN_SECOND;
 
-               if (fprintf(stderr, "[%.2" PRIu64 ":%.2u.%.6u] ",
-                               minutes, seconds, microseconds) < 0)
-                       return SR_ERR;
+               ret = g_fprintf(stderr, "sr: [%.2" PRIu64 ":%.2u.%.6u] ",
+                               minutes, seconds, microseconds);
+       } else {
+               ret = fputs("sr: ", stderr);
        }
-       if (sr_log_domain[0] != '\0' && fputs(sr_log_domain, stderr) < 0)
-               return SR_ERR;
-       if (vfprintf(stderr, format, args) < 0)
-               return SR_ERR;
-       if (putc('\n', stderr) < 0)
+
+       if (ret < 0 || g_vfprintf(stderr, format, args) < 0
+                       || putc('\n', stderr) < 0)
                return SR_ERR;
 
        return SR_OK;