babeltrace lib cleanup, folded with open/remove trace functions

[babeltrace.git] / lib / trace-handle.c

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index fce2397c0d2c4481bd7515db07ac004067e10f77..73c137b3464011ffaf8e491f567f27bebb80103f 100644 (file)
--- a/lib/trace-handle.c
+++ b/lib/trace-handle.c
@@ -30,41 +30,32 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 {
        struct bt_trace_handle *th;
 
-       th = calloc(1, sizeof(struct bt_trace_handle));
-       if (!th) {
-               perror("allocating trace_handle");
-               return NULL;
-       }
-       if (!ctx)
-               return NULL;
-
+       th = g_new0(struct bt_trace_handle, 1);
        th->id = ctx->last_trace_handle_id++;
        return th;
 }
 
-void bt_trace_handle_destroy(struct bt_trace_handle *bt)
+void bt_trace_handle_destroy(struct bt_trace_handle *th)
+{
+       g_free(th);
+}
+
+int bt_trace_handle_get_id(struct bt_trace_handle *th)
 {
-       if (bt)
-               free(bt);
+       return th->id;
 }
 
-char *bt_trace_handle_get_path(struct bt_trace_handle *th)
+const char *bt_trace_handle_get_path(struct bt_trace_handle *th)
 {
-       if (th && th->path)
-               return th->path;
-       return NULL;
+       return th->path;
 }
 
 uint64_t bt_trace_handle_get_timestamp_begin(struct bt_trace_handle *th)
 {
-       if (th)
-               return th->timestamp_begin;
-       return -1ULL;
+       return th->timestamp_begin;
 }
 
 uint64_t bt_trace_handle_get_timestamp_end(struct bt_trace_handle *th)
 {
-       if (th)
-               return th->timestamp_end;
-       return -1ULL;
+       return th->timestamp_end;
 }