X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Ftrimmer%2Ftrimmer.c;h=a3016212219660fe341a7a7722232f8a604c06be;hb=498e7994d60bd0e9f63c3d5c0fd00eec77ba7c34;hp=889845a1d6fdde2ccb7cb1f53151625fe138cc57;hpb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;p=babeltrace.git

diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index 889845a1..a3016212 100644
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -30,6 +30,7 @@
 #include <babeltrace2/babeltrace.h>
 #include "common/common.h"
 #include "common/assert.h"
+#include <stdbool.h>
 #include <stdint.h>
 #include <inttypes.h>
 #include <glib.h>
@@ -974,8 +975,6 @@ state_set_trimmer_iterator_bounds(
 		for (i = 0; i < count; i++) {
 			const bt_message *msg = msgs[i];
 			bool has_ns_from_origin;
-			int ret;
-
 			ret = get_msg_ns_from_origin(msg, &ns_from_origin,
 				&has_ns_from_origin);
 			if (ret) {
@@ -1935,7 +1934,7 @@ bt_component_class_message_iterator_next_method_status trimmer_msg_iter_next(
 			status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 	}