configure.ac, lib: rename "extra" (version) to "development stage"

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

diff --git a/src/lib/logging.c b/src/lib/logging.c
index 64bd8ca9a3c1f4d394c9103bac0acc337146c965..e7d13d89aa09a422141cc43d5d01012465795b0d 100644 (file)
--- a/src/lib/logging.c
+++ b/src/lib/logging.c
@@ -21,8 +21,7 @@
  */
 
 #include <stdlib.h>
-#include <babeltrace2/logging.h>
-#include <babeltrace2/version.h>
+#include <babeltrace2/babeltrace.h>
 
 #define BT_LOG_TAG "LIB/LOGGING"
 #include "lib/logging.h"
@@ -43,7 +42,7 @@ int bt_lib_log_level = BT_LOG_NONE;
 
 enum bt_logging_level bt_logging_get_minimal_level(void)
 {
-       return BT_LOG_LEVEL;
+       return BT_MINIMAL_LOG_LEVEL;
 }
 
 enum bt_logging_level bt_logging_get_global_level(void)
@@ -59,13 +58,13 @@ void bt_logging_set_global_level(enum bt_logging_level log_level)
 static
 void __attribute__((constructor)) bt_logging_ctor(void)
 {
-       const char *v_extra = bt_version_get_extra() ? bt_version_get_extra() :
-               "";
+       const char *v_extra = bt_version_get_development_stage() ?
+               bt_version_get_development_stage() : "";
 
        bt_logging_set_global_level(
                bt_log_get_level_from_env("LIBBABELTRACE2_INIT_LOG_LEVEL"));
-       BT_LOGI("Babeltrace %d.%d.%d%s library loaded: "
-               "major=%d, minor=%d, patch=%d, extra=\"%s\"",
+       BT_LOGI("Babeltrace %u.%u.%u%s library loaded: "
+               "major=%u, minor=%u, patch=%u, extra=\"%s\"",
                bt_version_get_major(), bt_version_get_minor(),
                bt_version_get_patch(), v_extra,
                bt_version_get_major(), bt_version_get_minor(),