Move to kernel style SPDX license identifiers

[babeltrace.git] / src / ctf-writer / trace.h

diff --git a/src/ctf-writer/trace.h b/src/ctf-writer/trace.h
index ae5f1ec3918d6841a8f4f608baf750ff5122c970..7fe067d2f75fc65290f1585442e7b28ac929316d 100644 (file)
--- a/src/ctf-writer/trace.h
+++ b/src/ctf-writer/trace.h
@@ -1,38 +1,20 @@
-#ifndef BABELTRACE_CTF_WRITER_TRACE_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_TRACE_INTERNAL_H
-
 /*
- * Copyright 2014 EfficiOS Inc.
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2014 EfficiOS Inc.
  *
  * The Common Trace Format (CTF) Specification is available at
  * http://www.efficios.com/ctf
  */
 
-#include "common/babeltrace.h"
-#include "compat/uuid.h"
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/trace.h>
+#ifndef BABELTRACE_CTF_WRITER_TRACE_INTERNAL_H
+#define BABELTRACE_CTF_WRITER_TRACE_INTERNAL_H
+
+#include "common/macros.h"
+#include "common/uuid.h"
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/trace.h>
 #include <babeltrace2/types.h>
 #include <glib.h>
 #include <sys/types.h>
@@ -49,8 +31,8 @@ struct bt_ctf_trace_common {
        struct bt_ctf_object base;
        GString *name;
        int frozen;
-       unsigned char uuid[BABELTRACE_UUID_LEN];
-       bt_bool uuid_set;
+       bt_uuid_t uuid;
+       bt_ctf_bool uuid_set;
        enum bt_ctf_byte_order native_byte_order;
        struct bt_ctf_private_value *environment;
        GPtrArray *clock_classes; /* Array of pointers to bt_ctf_clock_class */
@@ -67,7 +49,7 @@ struct bt_ctf_trace_common {
 };
 
 BT_HIDDEN
-bt_bool bt_ctf_trace_common_has_clock_class(struct bt_ctf_trace_common *trace,
+bt_ctf_bool bt_ctf_trace_common_has_clock_class(struct bt_ctf_trace_common *trace,
                struct bt_ctf_clock_class *clock_class);
 
 BT_HIDDEN
@@ -88,14 +70,14 @@ BT_HIDDEN
 int bt_ctf_trace_common_set_name(struct bt_ctf_trace_common *trace, const char *name);
 
 static inline
-const unsigned char *bt_ctf_trace_common_get_uuid(struct bt_ctf_trace_common *trace)
+const uint8_t *bt_ctf_trace_common_get_uuid(struct bt_ctf_trace_common *trace)
 {
        BT_CTF_ASSERT_PRE_NON_NULL(trace, "Trace");
        return trace->uuid_set ? trace->uuid : NULL;
 }
 
 BT_HIDDEN
-int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, const unsigned char *uuid);
+int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, const uint8_t *uuid);
 
 BT_HIDDEN
 int bt_ctf_trace_common_set_environment_field(struct bt_ctf_trace_common *trace,
@@ -117,7 +99,7 @@ int64_t bt_ctf_trace_common_get_environment_field_count(
 
        BT_CTF_ASSERT_PRE_NON_NULL(trace, "Trace");
        ret = bt_ctf_attributes_get_count(trace->environment);
-       BT_ASSERT(ret >= 0);
+       BT_ASSERT_DBG(ret >= 0);
        return ret;
 }
 
@@ -388,4 +370,8 @@ struct bt_ctf_value *
 bt_ctf_trace_get_environment_field_value_by_name(
                struct bt_ctf_trace *trace, const char *name);
 
+BT_HIDDEN
+int bt_ctf_trace_visit(struct bt_ctf_trace *trace,
+               bt_ctf_visitor visitor, void *data);
+
 #endif /* BABELTRACE_CTF_WRITER_TRACE_INTERNAL_H */