lib: add aliases for Babeltrace structure types

[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 f371095ce5eed5ccf87945993a58fe457cad8cc4..2549875013a01c7bf39fdc3a9844ecd764f28027 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -282,7 +282,7 @@ static void lttng_live_disconnect_viewer(struct bt_live_viewer_connection *viewe
        }
 }
 
-static void connection_release(struct bt_object *obj)
+static void connection_release(bt_object *obj)
 {
        struct bt_live_viewer_connection *conn =
                container_of(obj, struct bt_live_viewer_connection, obj);
@@ -291,15 +291,15 @@ static void connection_release(struct bt_object *obj)
 }
 
 static
-enum bt_value_status list_update_session(struct bt_value *results,
+enum bt_value_status list_update_session(bt_value *results,
                const struct lttng_viewer_session *session,
                bool *_found)
 {
        enum bt_value_status ret = BT_VALUE_STATUS_OK;
-       struct bt_value *map = NULL;
-       struct bt_value *hostname = NULL;
-       struct bt_value *session_name = NULL;
-       struct bt_value *btval = NULL;
+       bt_value *map = NULL;
+       bt_value *hostname = NULL;
+       bt_value *session_name = NULL;
+       bt_value *btval = NULL;
        int i, len;
        bool found = false;
 
@@ -351,7 +351,7 @@ enum bt_value_status list_update_session(struct bt_value *results,
                        if (ret != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
-                       BT_OBJECT_PUT_REF_AND_RESET(btval);
+                       BT_VALUE_PUT_REF_AND_RESET(btval);
 
                        btval = bt_value_map_get(map, "client-count");
                        if (!btval) {
@@ -365,33 +365,33 @@ enum bt_value_status list_update_session(struct bt_value *results,
                        if (ret != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
-                       BT_OBJECT_PUT_REF_AND_RESET(btval);
+                       BT_VALUE_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);
+               BT_VALUE_PUT_REF_AND_RESET(hostname);
+               BT_VALUE_PUT_REF_AND_RESET(session_name);
+               BT_VALUE_PUT_REF_AND_RESET(map);
 
                if (found) {
                        break;
                }
        }
 end:
-       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);
+       BT_VALUE_PUT_REF_AND_RESET(btval);
+       BT_VALUE_PUT_REF_AND_RESET(hostname);
+       BT_VALUE_PUT_REF_AND_RESET(session_name);
+       BT_VALUE_PUT_REF_AND_RESET(map);
        *_found = found;
        return ret;
 }
 
 static
-enum bt_value_status list_append_session(struct bt_value *results,
+enum bt_value_status list_append_session(bt_value *results,
                GString *base_url,
                const struct lttng_viewer_session *session)
 {
        enum bt_value_status ret = BT_VALUE_STATUS_OK;
-       struct bt_value *map = NULL;
+       bt_value *map = NULL;
        GString *url = NULL;
        bool found = false;
 
@@ -497,7 +497,7 @@ end:
        if (url) {
                g_string_free(url, TRUE);
        }
-       BT_OBJECT_PUT_REF_AND_RESET(map);
+       BT_VALUE_PUT_REF_AND_RESET(map);
        return ret;
 }
 
@@ -538,9 +538,9 @@ end:
  */
 
 BT_HIDDEN
-struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection)
+bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection)
 {
-       struct bt_value *results = NULL;
+       bt_value *results = NULL;
        struct lttng_viewer_cmd cmd;
        struct lttng_viewer_list_sessions list;
        uint32_t i, sessions_count;
@@ -603,7 +603,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
        }
        goto end;
 error:
-       BT_OBJECT_PUT_REF_AND_RESET(results);
+       BT_VALUE_PUT_REF_AND_RESET(results);
 end:
        return results;
 }