Handle negative time and offset from Epoch

[babeltrace.git] / formats / ctf / metadata / ctf-visitor-generate-io-struct.c

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 5f47930f23a428f064b2c137152bad335867c060..53d67d24c77ede0c217db3f4282b6a75764e4962 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -219,7 +219,6 @@ int get_unary_signed(struct bt_list_head *head, int64_t *value)
 
        bt_list_for_each_entry(node, head, siblings) {
                if (node->type != NODE_UNARY_EXPRESSION
-                               || node->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT
                                || (node->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT && node->u.unary_expression.type != UNARY_SIGNED_CONSTANT)
                                || node->u.unary_expression.link != UNARY_LINK_UNKNOWN
                                || i != 0)
@@ -255,7 +254,7 @@ int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid)
                                || i != 0)
                        return -EINVAL;
                src_string = node->u.unary_expression.u.string;
-               ret = babeltrace_uuid_parse(src_string, uuid);
+               ret = bt_uuid_parse(src_string, uuid);
        }
        return ret;
 }
@@ -2178,7 +2177,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                goto error;
                        }
                        if (CTF_TRACE_FIELD_IS_SET(trace, uuid)
-                               && babeltrace_uuid_compare(uuid, trace->uuid)) {
+                               && bt_uuid_compare(uuid, trace->uuid)) {
                                fprintf(fd, "[error] %s: uuid mismatch\n", __func__);
                                ret = -EPERM;
                                goto error;
@@ -2405,7 +2404,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                ret = -EPERM;
                                goto error;
                        }
-                       ret = get_unary_unsigned(&node->u.ctf_expression.right, &clock->offset_s);
+                       ret = get_unary_signed(&node->u.ctf_expression.right, &clock->offset_s);
                        if (ret) {
                                fprintf(fd, "[error] %s: unexpected unary expression for clock offset_s\n", __func__);
                                ret = -EINVAL;
@@ -2417,7 +2416,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                ret = -EPERM;
                                goto error;
                        }
-                       ret = get_unary_unsigned(&node->u.ctf_expression.right, &clock->offset);
+                       ret = get_unary_signed(&node->u.ctf_expression.right, &clock->offset);
                        if (ret) {
                                fprintf(fd, "[error] %s: unexpected unary expression for clock offset\n", __func__);
                                ret = -EINVAL;