Values API: standardize parameters and return values

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

diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index e782a7b7b58bdc760de8b84816eb2f32b881659c..0c2cd3cf14565d6c6720cdde78ca386a54217df7 100644 (file)
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -103,7 +103,7 @@ void try_print_last(struct counter *counter)
 
 void destroy_private_counter_data(struct counter *counter)
 {
-       bt_put(counter->notif_iter);
+       bt_object_put_ref(counter->notif_iter);
        g_free(counter);
 }
 
@@ -115,7 +115,7 @@ void counter_finalize(struct bt_private_component *component)
        counter = bt_private_component_get_user_data(component);
        BT_ASSERT(counter);
        try_print_last(counter);
-       bt_put(counter->notif_iter);
+       bt_object_put_ref(counter->notif_iter);
        g_free(counter);
 }
 
@@ -140,22 +140,21 @@ enum bt_component_status counter_init(struct bt_private_component *component,
 
        counter->last_printed_total = -1ULL;
        counter->step = 1000;
-       step = bt_value_map_borrow(params, "step");
+       step = bt_value_map_borrow_entry_value(params, "step");
        if (step && bt_value_is_integer(step)) {
                int64_t val;
 
-               (void) bt_value_integer_get(step, &val);
-
+               val = bt_value_integer_get(step);
                if (val >= 0) {
                        counter->step = (uint64_t) val;
                }
        }
 
-       hide_zero = bt_value_map_borrow(params, "hide-zero");
+       hide_zero = bt_value_map_borrow_entry_value(params, "hide-zero");
        if (hide_zero && bt_value_is_bool(hide_zero)) {
                bt_bool val;
 
-               (void) bt_value_bool_get(hide_zero, &val);
+               val = bt_value_bool_get(hide_zero);
                counter->hide_zero = (bool) val;
        }
 
@@ -195,10 +194,10 @@ enum bt_component_status counter_port_connected(
                goto end;
        }
 
-       BT_MOVE(counter->notif_iter, iterator);
+       BT_OBJECT_MOVE_REF(counter->notif_iter, iterator);
 
 end:
-       bt_put(connection);
+       bt_object_put_ref(connection);
        return status;
 }
 
@@ -266,7 +265,7 @@ enum bt_component_status counter_consume(struct bt_private_component *component)
                                counter->count.other++;
                        }
 
-                       bt_put(notif);
+                       bt_object_put_ref(notif);
                }
        }
        default: