X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=02f18ed5a9d94e500f522dbe22492af10160f72f;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=8d357e30524c811059cb41b45167a7d874cd54cf;hpb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 8d357e30..02f18ed5 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -111,7 +111,7 @@ static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
 				prefix, (_prefix2));			\
 									\
 		if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \
-			abort();					\
+			bt_common_abort();					\
 		}							\
 									\
 		tmp_prefix[TMP_PREFIX_LEN - 1] = '\0';			\
@@ -490,7 +490,7 @@ static inline void format_field_path(char **buf_ch, bool extended,
 			BUF_APPEND("%s", ", <CUR>");
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 	}
 
@@ -1198,6 +1198,13 @@ static inline void format_graph(char **buf_ch, bool extended,
 		&graph->packet_end_msg_pool);
 }
 
+static inline void format_message_iterator_class(char **buf_ch,
+		bool extended, const char *prefix,
+		const struct bt_message_iterator_class *iterator_class)
+{
+	/* Empty, the address is automatically printed. */
+}
+
 static inline void format_message_iterator(char **buf_ch,
 		bool extended, const char *prefix,
 		const struct bt_message_iterator *iterator)
@@ -1447,6 +1454,9 @@ static inline void handle_conversion_specifier_bt(void *priv_data,
 	case 'n':
 		format_message(buf_ch, extended, prefix, obj);
 		break;
+	case 'I':
+		format_message_iterator_class(buf_ch, extended, prefix, obj);
+		break;
 	case 'i':
 		format_message_iterator(buf_ch, extended, prefix, obj);
 		break;
@@ -1481,7 +1491,7 @@ static inline void handle_conversion_specifier_bt(void *priv_data,
 		format_error_cause(buf_ch, extended, prefix, obj);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 update_fmt:
@@ -1522,7 +1532,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