X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Ftrimmer.c;h=0c5af14776a0c1865a0dcfd1cadb5e5086a811af;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=21dc871a9eba14c638703a26ea52aad6da09dd8f;hpb=c6bd8523ba4a37b61a1591c03e23614112b155ba;p=babeltrace.git

diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c
index 21dc871a..0c5af147 100644
--- a/plugins/utils/trimmer/trimmer.c
+++ b/plugins/utils/trimmer/trimmer.c
@@ -48,7 +48,7 @@ struct trimmer *create_trimmer_data(void)
 	return g_new0(struct trimmer, 1);
 }
 
-void finalize_trimmer(struct bt_self_component *component)
+void finalize_trimmer(bt_self_component *component)
 {
 	void *data = bt_self_component_get_user_data(component);
 
@@ -72,7 +72,7 @@ void finalize_trimmer(struct bt_self_component *component)
  *   ss
  */
 static
-int timestamp_from_param(const char *param_name, struct bt_value *param,
+int timestamp_from_param(const char *param_name, bt_value *param,
 		struct trimmer *trimmer, struct trimmer_bound *result_bound,
 		bt_bool gmt)
 {
@@ -292,9 +292,9 @@ lazy:
 
 static
 enum bt_component_status init_from_params(struct trimmer *trimmer,
-		struct bt_value *params)
+		bt_value *params)
 {
-	struct bt_value *value = NULL;
+	bt_value *value = NULL;
 	bt_bool gmt = BT_FALSE;
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
@@ -310,7 +310,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
 		goto end;
 	}
 
-	BT_OBJECT_PUT_REF_AND_RESET(value);
+	BT_VALUE_PUT_REF_AND_RESET(value);
         value = bt_value_map_get(params, "begin");
 	if (value) {
 		if (timestamp_from_param("begin", value,
@@ -321,7 +321,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
 		}
 	}
 
-	BT_OBJECT_PUT_REF_AND_RESET(value);
+	BT_VALUE_PUT_REF_AND_RESET(value);
         value = bt_value_map_get(params, "end");
 	if (value) {
 		if (timestamp_from_param("end", value,
@@ -333,7 +333,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
 	}
 
 end:
-	bt_object_put_ref(value);
+	bt_value_put_ref(value);
 
 	if (trimmer->begin.set && trimmer->end.set) {
 		if (trimmer->begin.value > trimmer->end.value) {
@@ -345,7 +345,7 @@ end:
 }
 
 enum bt_component_status trimmer_component_init(
-	struct bt_self_component *component, struct bt_value *params,
+	bt_self_component *component, bt_value *params,
 	UNUSED_VAR void *init_method_data)
 {
 	enum bt_component_status ret;