X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdetails%2Fobj-lifetime-mgmt.c;h=97849a97dcc1fe1b71c210e00b12d27002a9a74e;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=9547d609cb08884095acb462415788518e7d7479;hpb=19bbdc9bfcbbfabb1f04dad12ff1df5d7075bf11;p=babeltrace.git

diff --git a/src/plugins/text/details/obj-lifetime-mgmt.c b/src/plugins/text/details/obj-lifetime-mgmt.c
index 9547d609..97849a97 100644
--- a/src/plugins/text/details/obj-lifetime-mgmt.c
+++ b/src/plugins/text/details/obj-lifetime-mgmt.c
@@ -1,25 +1,11 @@
 /*
- * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
+#include <stdbool.h>
+
 #include <babeltrace2/babeltrace.h>
 
 #include "common/common.h"
@@ -48,8 +34,8 @@ struct details_trace_class_meta *borrow_trace_class_meta(
 {
 	struct details_trace_class_meta *details_tc_meta;
 
-	BT_ASSERT(ctx->details_comp->cfg.with_meta);
-	BT_ASSERT(ctx->details_comp->meta);
+	BT_ASSERT_DBG(ctx->details_comp->cfg.with_meta);
+	BT_ASSERT_DBG(ctx->details_comp->meta);
 	details_tc_meta = g_hash_table_lookup(ctx->details_comp->meta, tc);
 	if (!details_tc_meta) {
 		/* Not found: create one */
@@ -93,11 +79,11 @@ bool details_need_to_write_meta_object(struct details_write_ctx *ctx,
 		goto end;
 	}
 
-	BT_ASSERT(ctx->details_comp->meta);
+	BT_ASSERT_DBG(ctx->details_comp->meta);
 	details_tc_meta = g_hash_table_lookup(ctx->details_comp->meta, tc);
-	BT_ASSERT(details_tc_meta);
+	BT_ASSERT_DBG(details_tc_meta);
 	need_to_write =
-		g_hash_table_lookup(details_tc_meta->objects, obj) == NULL;
+		!g_hash_table_lookup(details_tc_meta->objects, obj);
 
 end:
 	return need_to_write;
@@ -128,9 +114,9 @@ bool details_need_to_write_trace_class(struct details_write_ctx *ctx,
 		goto end;
 	}
 
-	BT_ASSERT(ctx->details_comp->meta);
+	BT_ASSERT_DBG(ctx->details_comp->meta);
 	details_tc_meta = g_hash_table_lookup(ctx->details_comp->meta, tc);
-	need_to_write = details_tc_meta == NULL;
+	need_to_write = !details_tc_meta;
 
 end:
 	return need_to_write;
@@ -190,8 +176,8 @@ int details_trace_unique_id(struct details_write_ctx *ctx,
 	int ret = 0;
 	struct details_trace *details_trace = NULL;
 
-	BT_ASSERT(unique_id);
-	BT_ASSERT(ctx->details_comp->traces);
+	BT_ASSERT_DBG(unique_id);
+	BT_ASSERT_DBG(ctx->details_comp->traces);
 	if (!bt_g_hash_table_contains(ctx->details_comp->traces,
 			trace)) {
 		/* Not found: create one */