lib: private functions: do not repeat `private` word

[babeltrace.git] / plugins / utils / trimmer / trimmer.c

diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c
index d00c05e55b35ae6063660239d3de22bf4215ab1e..0aa747583c4154c49e2236a7ca08368ad922b936 100644 (file)
--- a/plugins/utils/trimmer/trimmer.c
+++ b/plugins/utils/trimmer/trimmer.c
@@ -34,7 +34,7 @@
 #include <plugins-common.h>
 #include "trimmer.h"
 #include "iterator.h"
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 
 static
 void destroy_trimmer_data(struct trimmer *trimmer)
@@ -298,23 +298,19 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
        bt_bool gmt = BT_FALSE;
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
-       assert(params);
+       BT_ASSERT(params);
 
         value = bt_value_map_get(params, "clock-gmt");
        if (value) {
                enum bt_value_status value_ret;
 
-               value_ret = bt_value_bool_get(value, &gmt);
-               if (value_ret) {
-                       ret = BT_COMPONENT_STATUS_INVALID;
-                       BT_LOGE_STR("Failed to retrieve clock-gmt value. Expecting a boolean");
-               }
+               gmt = bt_value_bool_get(value);
        }
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
        }
 
-       BT_PUT(value);
+       BT_OBJECT_PUT_REF_AND_RESET(value);
         value = bt_value_map_get(params, "begin");
        if (value) {
                if (timestamp_from_param("begin", value,
@@ -325,7 +321,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
                }
        }
 
-       BT_PUT(value);
+       BT_OBJECT_PUT_REF_AND_RESET(value);
         value = bt_value_map_get(params, "end");
        if (value) {
                if (timestamp_from_param("end", value,
@@ -337,7 +333,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
        }
 
 end:
-       bt_put(value);
+       bt_object_put_ref(value);
 
        if (trimmer->begin.set && trimmer->end.set) {
                if (trimmer->begin.value > trimmer->end.value) {
@@ -361,13 +357,13 @@ enum bt_component_status trimmer_component_init(
        }
 
        /* Create input and output ports */
-       ret = bt_private_component_filter_add_input_private_port(
+       ret = bt_private_component_filter_add_input_port(
                component, "in", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
        }
 
-       ret = bt_private_component_filter_add_output_private_port(
+       ret = bt_private_component_filter_add_output_port(
                component, "out", NULL, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;