Fix static build

Move init_usterr() to snprintf, along with its ust_loglevel state.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index f9c00ff07bda1d72bea3f42d1ad5d999023ca908..60cdbfa91a2c876f5d5ae05db7a6ceae2a065df6 100644 (file)
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -24,19 +24,6 @@
 
 static CDS_LIST_HEAD(lttng_transport_list);
 
-void init_usterr(void)
-{
-       char *ust_debug;
-
-       if (ust_loglevel == UST_LOGLEVEL_UNKNOWN) {
-               ust_debug = getenv("LTTNG_UST_DEBUG");
-               if (ust_debug)
-                       ust_loglevel = UST_LOGLEVEL_DEBUG;
-               else
-                       ust_loglevel = UST_LOGLEVEL_NORMAL;
-       }
-}
-
 struct lttng_transport *lttng_transport_find(const char *name)
 {
        struct lttng_transport *transport;

diff --git a/snprintf/core.c b/snprintf/core.c
index 2fa9839c4e4103c40635cfd8181418b9bf158ccf..966b588721aaf439bfd6ecfa1b4e74a617486a4f 100644 (file)
--- a/snprintf/core.c
+++ b/snprintf/core.c
@@ -21,3 +21,16 @@
 #include <usterr-signal-safe.h>
 
 volatile enum ust_loglevel ust_loglevel;
+
+void init_usterr(void)
+{
+       char *ust_debug;
+
+       if (ust_loglevel == UST_LOGLEVEL_UNKNOWN) {
+               ust_debug = getenv("LTTNG_UST_DEBUG");
+               if (ust_debug)
+                       ust_loglevel = UST_LOGLEVEL_DEBUG;
+               else
+                       ust_loglevel = UST_LOGLEVEL_NORMAL;
+       }
+}