lib: make values API const-correct

[babeltrace.git] / include / babeltrace / trace-ir / private-trace.h

diff --git a/include/babeltrace/trace-ir/private-trace.h b/include/babeltrace/trace-ir/private-trace.h
index a3651162f645098ab13b72f574ac8c186e4b9fb7..1336082e0294985690cdc5c044a3115a7b2a3739 100644 (file)
--- a/include/babeltrace/trace-ir/private-trace.h
+++ b/include/babeltrace/trace-ir/private-trace.h
@@ -42,7 +42,7 @@ struct bt_private_trace;
 struct bt_private_stream;
 struct bt_private_stream_class;
 struct bt_private_field_class;
-struct bt_private_value;
+struct bt_value;
 struct bt_private_packet_header_field;
 
 typedef void (* bt_private_trace_is_static_listener)(
@@ -51,54 +51,58 @@ typedef void (* bt_private_trace_is_static_listener)(
 typedef void (* bt_private_trace_listener_removed)(
        struct bt_private_trace *trace, void *data);
 
-extern struct bt_trace *bt_trace_borrow_from_private(
-               struct bt_private_trace *priv_trace);
+static inline
+struct bt_trace *bt_private_trace_as_trace(
+               struct bt_private_trace *priv_trace)
+{
+       return (void *) priv_trace;
+}
 
 extern struct bt_private_trace *bt_private_trace_create(void);
 
-extern int bt_private_trace_set_assigns_automatic_stream_class_id(
+extern void bt_private_trace_set_assigns_automatic_stream_class_id(
                struct bt_private_trace *trace, bt_bool value);
 
 extern int bt_private_trace_set_name(struct bt_private_trace *trace,
                const char *name);
 
-extern int bt_private_trace_set_uuid(struct bt_private_trace *trace,
+extern void bt_private_trace_set_uuid(struct bt_private_trace *trace,
                bt_uuid uuid);
 
-extern void bt_private_trace_borrow_private_environment_entry_by_index(
+extern void bt_private_trace_borrow_environment_entry_by_index(
                struct bt_private_trace *trace, uint64_t index,
-               const char **name, struct bt_private_value **value);
+               const char **name, const struct bt_value **value);
 
-extern struct bt_private_value *
-bt_private_trace_borrow_private_environment_entry_value_by_name(
+extern const struct bt_value *
+bt_private_trace_borrow_environment_entry_value_by_name(
                struct bt_private_trace *trace, const char *name);
 
-extern int bt_private_trace_set_private_environment_entry_integer(
+extern int bt_private_trace_set_environment_entry_integer(
                struct bt_private_trace *trace, const char *name,
                int64_t value);
 
-extern int bt_private_trace_set_private_environment_entry_string(
+extern int bt_private_trace_set_environment_entry_string(
                struct bt_private_trace *trace, const char *name,
                const char *value);
 
 extern struct bt_private_field_class *
-bt_private_trace_borrow_packet_header_private_field_class(
+bt_private_trace_borrow_packet_header_field_class(
                struct bt_private_trace *trace);
 
-extern int bt_private_trace_set_packet_header_private_field_class(
+extern int bt_private_trace_set_packet_header_field_class(
                struct bt_private_trace *trace,
                struct bt_private_field_class *packet_header_field_class);
 
 extern struct bt_private_stream_class *
-bt_private_trace_borrow_private_stream_class_by_index(
+bt_private_trace_borrow_stream_class_by_index(
                struct bt_private_trace *trace, uint64_t index);
 
 extern struct bt_private_stream_class *
-bt_private_trace_borrow_private_stream_class_by_id(
+bt_private_trace_borrow_stream_class_by_id(
                struct bt_private_trace *trace, uint64_t id);
 
 extern struct bt_private_stream *
-bt_private_trace_borrow_private_stream_by_index(
+bt_private_trace_borrow_stream_by_index(
                struct bt_private_trace *trace, uint64_t index);
 
 extern struct bt_private_stream *bt_private_trace_borrow_stream_by_id(