lib: make public reference count functions have strict 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 79d2c31ef926962f7f709e763829af59e36ec01c..17fc234de4f4371938614de8e9248468f9d5a8f4 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -327,14 +327,8 @@ enum bt_value_status list_update_session(struct bt_value *results,
                        ret = BT_VALUE_STATUS_ERROR;
                        goto end;
                }
-               ret = bt_value_string_get(hostname, &hostname_str);
-               if (ret != BT_VALUE_STATUS_OK) {
-                       goto end;
-               }
-               ret = bt_value_string_get(session_name, &session_name_str);
-               if (ret != BT_VALUE_STATUS_OK) {
-                       goto end;
-               }
+               hostname_str = bt_value_string_get(hostname);
+               session_name_str = bt_value_string_get(session_name);
 
                if (!strcmp(session->hostname, hostname_str)
                                && !strcmp(session->session_name,
@@ -350,49 +344,43 @@ enum bt_value_status list_update_session(struct bt_value *results,
                                ret = BT_VALUE_STATUS_ERROR;
                                goto end;
                        }
-                       ret = bt_value_integer_get(btval, &val);
-                       if (ret != BT_VALUE_STATUS_OK) {
-                               goto end;
-                       }
+                       val = bt_value_integer_get(btval);
                        /* sum */
                        val += streams;
                        ret = bt_private_integer_bool_set(btval, val);
                        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) {
                                ret = BT_VALUE_STATUS_ERROR;
                                goto end;
                        }
-                       ret = bt_value_integer_get(btval, &val);
-                       if (ret != BT_VALUE_STATUS_OK) {
-                               goto end;
-                       }
+                       val = bt_value_integer_get(btval);
                        /* max */
                        val = max_t(int64_t, clients, val);
                        ret = bt_private_integer_bool_set(btval, val);
                        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;
 }
@@ -509,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;
 }
 
@@ -615,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;
 }