X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=c648e336c9c3fc4abb5a90cb83c40b8e46326042;hb=37996f2f190c8d0f35271c785121f6c2df0aba49;hp=dc0c97c5dcd573fcb7080122af4f40a4e9456b69;hpb=467673c1a8e30cc146cddffa1970bbb430052680;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index dc0c97c5..c648e336 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <wchar.h>
 #include <glib.h>
@@ -239,7 +240,8 @@ static inline void format_field_class(char **buf_ch, bool extended,
 		BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
 	{
 		const struct bt_field_class_array_dynamic *array_fc =
 			(const void *) field_class;
@@ -260,10 +262,10 @@ static inline void format_field_class(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
 	{
 		const struct bt_field_class_option *opt_fc =
 			(const void *) field_class;
@@ -273,8 +275,8 @@ static inline void format_field_class(char **buf_ch, bool extended,
 			PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type)));
 
 		if (field_class->type !=
-				BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) {
-			const struct bt_field_class_option_with_selector *opt_with_sel_fc =
+				BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) {
+			const struct bt_field_class_option_with_selector_field *opt_with_sel_fc =
 				(const void *) field_class;
 
 			if (opt_with_sel_fc->selector_fc) {
@@ -292,9 +294,9 @@ static inline void format_field_class(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
 	{
 		const struct bt_field_class_variant *var_fc =
 			(const void *) field_class;
@@ -304,9 +306,9 @@ static inline void format_field_class(char **buf_ch, bool extended,
 				PRFIELD(var_fc->common.named_fcs->len));
 		}
 
-		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
-				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
-			const struct bt_field_class_variant_with_selector *var_with_sel_fc =
+		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
+				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
+			const struct bt_field_class_variant_with_selector_field *var_with_sel_fc =
 				(const void *) var_fc;
 
 			if (var_with_sel_fc->selector_fc) {
@@ -428,7 +430,8 @@ static inline void format_field(char **buf_ch, bool extended,
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
 	{
 		const struct bt_field_array *array_field = (const void *) field;
 
@@ -441,9 +444,9 @@ static inline void format_field(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
 	{
 		const struct bt_field_variant *var_field = (const void *) field;
 
@@ -907,9 +910,8 @@ static inline void format_value(char **buf_ch, bool extended,
 	}
 	case BT_VALUE_TYPE_ARRAY:
 	{
-		int64_t count = bt_value_array_get_length(value);
+		uint64_t count = bt_value_array_get_length(value);
 
-		BT_ASSERT(count >= 0);
 		BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));
 		break;
 	}
@@ -1520,7 +1522,8 @@ void bt_lib_maybe_log_and_append_cause(const char *func, const char *file,
 	}
 
 	status = bt_current_thread_error_append_cause_from_unknown(
-		"Babeltrace library", file, line, "%s", lib_logging_buf);
+		BT_LIB_LOG_LIBBABELTRACE2_NAME, file, line, "%s",
+		lib_logging_buf);
 	if (status) {
 		/*
 		 * Worst case: this error cause is not appended to the