From 85380e99e5758a072f6f7c54f90767ffa2a89523 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 25 Aug 2016 14:31:25 -0400 Subject: [PATCH] Allow NULL clock name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- formats/ctf/ir/clock.c | 31 ++++++++++--------------------- include/babeltrace/ctf-ir/clock.h | 7 ++----- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c index 002b7205..738f2d80 100644 --- a/formats/ctf/ir/clock.c +++ b/formats/ctf/ir/clock.c @@ -37,22 +37,6 @@ static void bt_ctf_clock_destroy(struct bt_object *obj); -struct bt_ctf_clock *bt_ctf_clock_create_empty(void) -{ - struct bt_ctf_clock *clock = g_new0( - struct bt_ctf_clock, 1); - - if (!clock) { - goto end; - } - - clock->precision = 1; - clock->frequency = 1000000000; - bt_object_init(clock, bt_ctf_clock_destroy); -end: - return clock; -} - BT_HIDDEN bool bt_ctf_clock_is_valid(struct bt_ctf_clock *clock) { @@ -91,16 +75,21 @@ end: struct bt_ctf_clock *bt_ctf_clock_create(const char *name) { int ret; - struct bt_ctf_clock *clock = NULL; + struct bt_ctf_clock *clock = g_new0(struct bt_ctf_clock, 1); - clock = bt_ctf_clock_create_empty(); if (!clock) { goto error; } - ret = bt_ctf_clock_set_name(clock, name); - if (ret) { - goto error; + clock->precision = 1; + clock->frequency = 1000000000; + bt_object_init(clock, bt_ctf_clock_destroy); + + if (name) { + ret = bt_ctf_clock_set_name(clock, name); + if (ret) { + goto error; + } } ret = bt_uuid_generate(clock->uuid); diff --git a/include/babeltrace/ctf-ir/clock.h b/include/babeltrace/ctf-ir/clock.h index 5858a711..93d4cbef 100644 --- a/include/babeltrace/ctf-ir/clock.h +++ b/include/babeltrace/ctf-ir/clock.h @@ -43,16 +43,13 @@ struct bt_ctf_clock; * * Allocate a new clock setting its reference count to 1. * - * @param name Name of the clock (will be copied). + * @param name Name of the clock (will be copied); can be set to NULL + * for nameless clocks. * * Returns an allocated clock on success, NULL on error. */ extern struct bt_ctf_clock *bt_ctf_clock_create(const char *name); -extern struct bt_ctf_clock *bt_ctf_clock_create_empty(void); - -extern int bt_ctf_clock_set_name(struct bt_ctf_clock *clock, const char *name); - /* * bt_ctf_clock_get_name: get a clock's name. * -- 2.34.1