autogen.sh: aclocal support for Windows XP/Vista/7.

[libsigrok.git] / log.c

diff --git a/log.c b/log.c
index e8cebb1bda544c21cc5f97cd87571b299bb19013..697c1087ad82b0a421d616b831c0bd4b4a1bbc68 100644 (file)
--- a/log.c
+++ b/log.c
@@ -20,8 +20,8 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 static int sr_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
 
@@ -32,12 +32,12 @@ static int sr_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
  * and so on) libsigrok will output. Using SR_LOG_NONE disables all messages.
  *
  * @param loglevel The loglevel to set (SR_LOG_NONE, SR_LOG_ERR, SR_LOG_WARN,
- *                 SR_LOG_INFO, or SR_LOG_DBG).
+ *                 SR_LOG_INFO, SR_LOG_DBG, or SR_LOG_SPEW).
  * @return SR_OK upon success, SR_ERR_ARG upon invalid loglevel.
  */
-int sr_set_loglevel(int loglevel)
+SR_API int sr_set_loglevel(int loglevel)
 {
-       if (loglevel < SR_LOG_NONE || loglevel > SR_LOG_DBG) {
+       if (loglevel < SR_LOG_NONE || loglevel > SR_LOG_SPEW) {
                sr_err("log: %s: invalid loglevel %d", __func__, loglevel);
                return SR_ERR_ARG;
        }
@@ -54,7 +54,7 @@ int sr_set_loglevel(int loglevel)
  *
  * @return The currently configured libsigrok loglevel.
  */
-int sr_get_loglevel(void)
+SR_API int sr_get_loglevel(void)
 {
        return sr_loglevel;
 }
@@ -73,7 +73,7 @@ static int sr_logv(int loglevel, const char *format, va_list args)
        return ret;
 }
 
-int sr_log(int loglevel, const char *format, ...)
+SR_PRIV int sr_log(int loglevel, const char *format, ...)
 {
        int ret;
        va_list args;
@@ -85,7 +85,19 @@ int sr_log(int loglevel, const char *format, ...)
        return ret;
 }
 
-int sr_dbg(const char *format, ...)
+SR_PRIV int sr_spew(const char *format, ...)
+{
+       int ret;
+       va_list args;
+
+       va_start(args, format);
+       ret = sr_logv(SR_LOG_SPEW, format, args);
+       va_end(args);
+
+       return ret;
+}
+
+SR_PRIV int sr_dbg(const char *format, ...)
 {
        int ret;
        va_list args;
@@ -97,7 +109,7 @@ int sr_dbg(const char *format, ...)
        return ret;
 }
 
-int sr_info(const char *format, ...)
+SR_PRIV int sr_info(const char *format, ...)
 {
        int ret;
        va_list args;
@@ -109,7 +121,7 @@ int sr_info(const char *format, ...)
        return ret;
 }
 
-int sr_warn(const char *format, ...)
+SR_PRIV int sr_warn(const char *format, ...)
 {
        int ret;
        va_list args;
@@ -121,7 +133,7 @@ int sr_warn(const char *format, ...)
        return ret;
 }
 
-int sr_err(const char *format, ...)
+SR_PRIV int sr_err(const char *format, ...)
 {
        int ret;
        va_list args;