X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=df73244b22e969978054b679d7330c97357d1f6e;hb=1e123ed605bf4936226d675e6725691bff249f7f;hp=88be5c769e6ac2b59fb953aa262bc2c5b508adfe;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 88be5c76..df73244b 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -21,8 +21,7 @@
 #include <babeltrace2/babeltrace.h>
 
 #include "logging.h"
-#include "assert-pre.h"
-#include "assert-post.h"
+#include "assert-cond.h"
 #include "value.h"
 #include "integer-range-set.h"
 #include "object-pool.h"
@@ -58,7 +57,6 @@
 #include "trace-ir/trace.h"
 #include "trace-ir/utils.h"
 #include "error.h"
-#include "assert-pre.h"
 
 #define LIB_LOGGING_BUF_SIZE	(4096 * 4)
 
@@ -331,6 +329,8 @@ static inline void format_field_integer_extended(char **buf_ch,
 		fmt = ", %svalue=%" PRIx64;
 	}
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 	if (field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
 			field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION) {
 		if (!fmt) {
@@ -345,6 +345,7 @@ static inline void format_field_integer_extended(char **buf_ch,
 
 		BUF_APPEND(fmt, PRFIELD(integer->value.u));
 	}
+#pragma GCC diagnostic pop
 }
 
 static inline void format_field(char **buf_ch, bool extended,
@@ -931,7 +932,7 @@ static inline void format_message(char **buf_ch, bool extended,
 	char tmp_prefix[TMP_PREFIX_LEN];
 
 	BUF_APPEND(", %stype=%s",
-		PRFIELD(bt_message_type_string(msg->type)));
+		PRFIELD(bt_common_message_type_string(msg->type)));
 
 	if (!extended) {
 		return;
@@ -1056,7 +1057,7 @@ static inline void format_component_class(char **buf_ch, bool extended,
 	char tmp_prefix[TMP_PREFIX_LEN];
 
 	BUF_APPEND(", %stype=%s, %sname=\"%s\"",
-		PRFIELD(bt_component_class_type_string(comp_class->type)),
+		PRFIELD(bt_common_component_class_type_string(comp_class->type)),
 		PRFIELD_GSTRING(comp_class->name));
 
 	if (comp_class->description) {
@@ -1334,7 +1335,7 @@ static inline void format_error_cause(char **buf_ch, bool extended,
 	if (comp_class_id) {
 		BUF_APPEND(", %scomp-cls-type=%s, %scomp-cls-name=\"%s\", "
 			"%splugin-name=\"%s\"",
-			PRFIELD(bt_component_class_type_string(
+			PRFIELD(bt_common_component_class_type_string(
 				comp_class_id->type)),
 			PRFIELD_GSTRING(comp_class_id->name),
 			PRFIELD_GSTRING(comp_class_id->plugin_name));
@@ -1483,6 +1484,15 @@ update_fmt:
 	*out_fmt_ch = fmt_ch;
 }
 
+void bt_lib_log_v(const char *func, const char *file, unsigned line,
+		int lvl, const char *tag, const char *fmt, va_list *args)
+{
+	BT_ASSERT(fmt);
+	bt_common_custom_vsnprintf(lib_logging_buf, LIB_LOGGING_BUF_SIZE, '!',
+		handle_conversion_specifier_bt, NULL, fmt, args);
+	_bt_log_write_d(func, file, line, lvl, tag, "%s", lib_logging_buf);
+}
+
 void bt_lib_log(const char *func, const char *file, unsigned line,
 		int lvl, const char *tag, const char *fmt, ...)
 {
@@ -1490,10 +1500,8 @@ void bt_lib_log(const char *func, const char *file, unsigned line,
 
 	BT_ASSERT(fmt);
 	va_start(args, fmt);
-	bt_common_custom_vsnprintf(lib_logging_buf, LIB_LOGGING_BUF_SIZE, '!',
-		handle_conversion_specifier_bt, NULL, fmt, &args);
+	bt_lib_log_v(func, file, line, lvl, tag, fmt, &args);
 	va_end(args);
-	_bt_log_write_d(func, file, line, lvl, tag, "%s", lib_logging_buf);
 }
 
 void bt_lib_maybe_log_and_append_cause(const char *func, const char *file,