Values API: split into private and public APIs

[babeltrace.git] / plugins / ctf / lttng-live / viewer-connection.c

diff --git a/plugins/ctf/lttng-live/viewer-connection.c b/plugins/ctf/lttng-live/viewer-connection.c
index 067ed2690008116bc4890fc647ab99f610dbca38..79d2c31ef926962f7f709e763829af59e36ec01c 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -356,11 +356,11 @@ enum bt_value_status list_update_session(struct bt_value *results,
                        }
                        /* sum */
                        val += streams;
-                       ret = bt_value_integer_set(btval, val);
+                       ret = bt_private_integer_bool_set(btval, val);
                        if (ret != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
-                       BT_PUT(btval);
+                       BT_OBJECT_PUT_REF_AND_RESET(btval);
 
                        btval = bt_value_map_get(map, "client-count");
                        if (!btval) {
@@ -373,26 +373,26 @@ enum bt_value_status list_update_session(struct bt_value *results,
                        }
                        /* max */
                        val = max_t(int64_t, clients, val);
-                       ret = bt_value_integer_set(btval, val);
+                       ret = bt_private_integer_bool_set(btval, val);
                        if (ret != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
-                       BT_PUT(btval);
+                       BT_OBJECT_PUT_REF_AND_RESET(btval);
                }
 
-               BT_PUT(hostname);
-               BT_PUT(session_name);
-               BT_PUT(map);
+               BT_OBJECT_PUT_REF_AND_RESET(hostname);
+               BT_OBJECT_PUT_REF_AND_RESET(session_name);
+               BT_OBJECT_PUT_REF_AND_RESET(map);
 
                if (found) {
                        break;
                }
        }
 end:
-       BT_PUT(btval);
-       BT_PUT(hostname);
-       BT_PUT(session_name);
-       BT_PUT(map);
+       BT_OBJECT_PUT_REF_AND_RESET(btval);
+       BT_OBJECT_PUT_REF_AND_RESET(hostname);
+       BT_OBJECT_PUT_REF_AND_RESET(session_name);
+       BT_OBJECT_PUT_REF_AND_RESET(map);
        *_found = found;
        return ret;
 }
@@ -416,7 +416,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
                goto end;
        }
 
-       map = bt_value_map_create();
+       map = bt_private_value_map_create();
        if (!map) {
                ret = BT_VALUE_STATUS_ERROR;
                goto end;
@@ -436,7 +436,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
        g_string_append_c(url, '/');
        g_string_append(url, session->session_name);
 
-       ret = bt_value_map_insert_string_entry(map, "url", url->str);
+       ret = bt_private_value_map_insert_string_entry(map, "url", url->str);
        if (ret != BT_VALUE_STATUS_OK) {
                goto end;
        }
@@ -445,7 +445,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
         * key = "target-hostname",
         * value = <string>,
         */
-       ret = bt_value_map_insert_string_entry(map, "target-hostname",
+       ret = bt_private_value_map_insert_string_entry(map, "target-hostname",
                session->hostname);
        if (ret != BT_VALUE_STATUS_OK) {
                goto end;
@@ -455,7 +455,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
         * key = "session-name",
         * value = <string>,
         */
-       ret = bt_value_map_insert_string_entry(map, "session-name",
+       ret = bt_private_value_map_insert_string_entry(map, "session-name",
                session->session_name);
        if (ret != BT_VALUE_STATUS_OK) {
                goto end;
@@ -468,7 +468,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
        {
                uint32_t live_timer = be32toh(session->live_timer);
 
-               ret = bt_value_map_insert_integer_entry(map, "timer-us",
+               ret = bt_private_value_map_insert_integer_entry(map, "timer-us",
                        live_timer);
                if (ret != BT_VALUE_STATUS_OK) {
                        goto end;
@@ -482,7 +482,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
        {
                uint32_t streams = be32toh(session->streams);
 
-               ret = bt_value_map_insert_integer_entry(map, "stream-count",
+               ret = bt_private_value_map_insert_integer_entry(map, "stream-count",
                        streams);
                if (ret != BT_VALUE_STATUS_OK) {
                        goto end;
@@ -497,19 +497,19 @@ enum bt_value_status list_append_session(struct bt_value *results,
        {
                uint32_t clients = be32toh(session->clients);
 
-               ret = bt_value_map_insert_integer_entry(map, "client-count",
+               ret = bt_private_value_map_insert_integer_entry(map, "client-count",
                        clients);
                if (ret != BT_VALUE_STATUS_OK) {
                        goto end;
                }
        }
 
-       ret = bt_value_array_append_element(results, map);
+       ret = bt_private_value_array_append_element(results, map);
 end:
        if (url) {
                g_string_free(url, TRUE);
        }
-       BT_PUT(map);
+       BT_OBJECT_PUT_REF_AND_RESET(map);
        return ret;
 }
 
@@ -562,7 +562,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
                goto error;
        }
 
-       results = bt_value_array_create();
+       results = bt_private_value_array_create();
        if (!results) {
                BT_LOGE("Error creating array");
                goto error;
@@ -615,7 +615,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
        }
        goto end;
 error:
-       BT_PUT(results);
+       BT_OBJECT_PUT_REF_AND_RESET(results);
 end:
        return results;
 }