lib: force user to include `<babeltrace2/babeltrace.h>`

[babeltrace.git] / src / lib / lib-logging.c

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index c9c8249b39af6ed07d5f7321495e6c56e6f98e8c..836ee9ad02ac2d5d8f9318f3a4c8de4ae7d62454 100644 (file)
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -33,10 +33,7 @@
 #include <glib.h>
 #include "common/common.h"
 #include "common/uuid.h"
-#include <babeltrace2/trace-ir/event-const.h>
-#include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/stream-const.h>
-#include <babeltrace2/current-thread.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "logging.h"
 #include "assert-pre.h"
@@ -104,11 +101,17 @@ static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
 
 #define PRFIELD_GSTRING(_expr) PRFIELD((_expr) ? (_expr)->str : NULL)
 
-#define TMP_PREFIX_LEN 64
+#define TMP_PREFIX_LEN 128
 #define SET_TMP_PREFIX(_prefix2)                                       \
        do {                                                            \
-               snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s",        \
-                       prefix, (_prefix2));                            \
+               int snprintf_ret =                                      \
+                       snprintf(tmp_prefix, TMP_PREFIX_LEN - 1, "%s%s", \
+                               prefix, (_prefix2));                    \
+                                                                       \
+               if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \
+                       abort();                                        \
+               }                                                       \
+                                                                       \
                tmp_prefix[TMP_PREFIX_LEN - 1] = '\0';                  \
        } while (0)