X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fdmesg%2Fdmesg.c;h=0edc2e6133dd7d0f4bcf42c705ed18ea48ea04bb;hb=da91b29ad2964b85601e25843f1dca92f6c97406;hp=f54af1c10a5677e424382e49fd869f39fbc1ea89;hpb=5cd6d0e5fa67c2bdd21dc153313618260595d7bc;p=babeltrace.git

diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c
index f54af1c1..0edc2e61 100644
--- a/plugins/text/dmesg/dmesg.c
+++ b/plugins/text/dmesg/dmesg.c
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <babeltrace/assert-internal.h>
+#include <babeltrace/common-internal.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/values-internal.h>
 #include <babeltrace/compat/utc-internal.h>
@@ -105,10 +106,10 @@ struct bt_field_class *create_event_payload_fc(void)
 	goto end;
 
 error:
-	BT_PUT(root_fc);
+	BT_OBJECT_PUT_REF_AND_RESET(root_fc);
 
 end:
-	bt_put(fc);
+	bt_object_put_ref(fc);
 	return root_fc;
 }
 
@@ -198,7 +199,7 @@ error:
 	ret = -1;
 
 end:
-	bt_put(fc);
+	bt_object_put_ref(fc);
 
 	if (basename) {
 		g_free(basename);
@@ -210,18 +211,18 @@ end:
 static
 int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params)
 {
-	struct bt_value *read_from_stdin = NULL;
 	struct bt_value *no_timestamp = NULL;
 	struct bt_value *path = NULL;
 	const char *path_str;
 	int ret = 0;
 
-	no_timestamp = bt_value_map_get(params, "no-extract-timestamp");
+	no_timestamp = bt_value_map_borrow_entry_value(params,
+		"no-extract-timestamp");
 	if (no_timestamp) {
 		if (!bt_value_is_bool(no_timestamp)) {
 			BT_LOGE("Expecting a boolean value for the `no-extract-timestamp` parameter: "
 				"type=%s",
-				bt_value_type_string(
+				bt_common_value_type_string(
 					bt_value_get_type(no_timestamp)));
 			goto error;
 		}
@@ -231,7 +232,7 @@ int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params)
 		BT_ASSERT(ret == 0);
 	}
 
-	path = bt_value_map_get(params, "path");
+	path = bt_value_map_borrow_entry_value(params, "path");
 	if (path) {
 		if (dmesg_comp->params.read_from_stdin) {
 			BT_LOGE_STR("Cannot specify both `read-from-stdin` and `path` parameters.");
@@ -241,7 +242,7 @@ int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params)
 		if (!bt_value_is_string(path)) {
 			BT_LOGE("Expecting a string value for the `path` parameter: "
 				"type=%s",
-				bt_value_type_string(
+				bt_common_value_type_string(
 					bt_value_get_type(path)));
 			goto error;
 		}
@@ -259,9 +260,6 @@ error:
 	ret = -1;
 
 end:
-	bt_put(read_from_stdin);
-	bt_put(path);
-	bt_put(no_timestamp);
 	return ret;
 }
 
@@ -342,13 +340,13 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
 		g_string_free(dmesg_comp->params.path, TRUE);
 	}
 
-	bt_put(dmesg_comp->packet);
-	bt_put(dmesg_comp->trace);
-	bt_put(dmesg_comp->stream_class);
-	bt_put(dmesg_comp->event_class);
-	bt_put(dmesg_comp->stream);
-	bt_put(dmesg_comp->clock_class);
-	bt_put(dmesg_comp->cc_prio_map);
+	bt_object_put_ref(dmesg_comp->packet);
+	bt_object_put_ref(dmesg_comp->trace);
+	bt_object_put_ref(dmesg_comp->stream_class);
+	bt_object_put_ref(dmesg_comp->event_class);
+	bt_object_put_ref(dmesg_comp->stream);
+	bt_object_put_ref(dmesg_comp->clock_class);
+	bt_object_put_ref(dmesg_comp->cc_prio_map);
 	g_free(dmesg_comp);
 }
 
@@ -515,7 +513,7 @@ skip_ts:
 	goto end;
 
 error:
-	BT_PUT(notif);
+	BT_OBJECT_PUT_REF_AND_RESET(notif);
 
 end:
 	return notif;
@@ -594,7 +592,7 @@ struct bt_notification *create_notif_from_line(
 	goto end;
 
 error:
-	BT_PUT(notif);
+	BT_OBJECT_PUT_REF_AND_RESET(notif);
 
 end:
 	return notif;
@@ -613,7 +611,7 @@ void destroy_dmesg_notif_iter(struct dmesg_notif_iter *dmesg_notif_iter)
 		}
 	}
 
-	bt_put(dmesg_notif_iter->tmp_event_notif);
+	bt_object_put_ref(dmesg_notif_iter->tmp_event_notif);
 	free(dmesg_notif_iter->linebuf);
 	g_free(dmesg_notif_iter);
 }
@@ -667,7 +665,7 @@ error:
 	}
 
 end:
-	bt_put(priv_comp);
+	bt_object_put_ref(priv_comp);
 	return status;
 }