configure: remove -Wno-format-nonliteral

[babeltrace.git] / src / ctf-writer / stream-class.h

diff --git a/src/ctf-writer/stream-class.h b/src/ctf-writer/stream-class.h
index f7fc4dbb1b871a698df5871cae6eb1a78127e2dc..9cb78fe6c2c6b3682c0836ba76bb33059d11cb0a 100644 (file)
--- a/src/ctf-writer/stream-class.h
+++ b/src/ctf-writer/stream-class.h
@@ -1,38 +1,20 @@
-#ifndef BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_STREAM_CLASS_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:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * 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
  */
 
+#ifndef BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H
+#define BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H
+
 #include "common/assert.h"
 #include "common/macros.h"
 #include "common/common.h"
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/visitor.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/visitor.h>
 #include <inttypes.h>
 
 #include "clock.h"
@@ -115,7 +97,7 @@ int64_t bt_ctf_stream_class_common_get_id(
        BT_CTF_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 
        if (!stream_class->id_set) {
-               BT_LOGV("Stream class's ID is not set: addr=%p, name=\"%s\"",
+               BT_LOGT("Stream class's ID is not set: addr=%p, name=\"%s\"",
                        stream_class,
                        bt_ctf_stream_class_common_get_name(stream_class));
                ret = (int64_t) -1;
@@ -155,7 +137,7 @@ static inline
 struct bt_ctf_trace_common *bt_ctf_stream_class_common_borrow_trace(
                struct bt_ctf_stream_class_common *stream_class)
 {
-       BT_ASSERT(stream_class);
+       BT_ASSERT_DBG(stream_class);
        return (void *) bt_ctf_object_borrow_parent(&stream_class->base);
 }
 
@@ -193,7 +175,7 @@ int bt_ctf_stream_class_common_set_name(struct bt_ctf_stream_class_common *strea
                g_string_assign(stream_class->name, name);
        }
 
-       BT_LOGV("Set stream class's name: "
+       BT_LOGT("Set stream class's name: "
                "addr=%p, name=\"%s\", id=%" PRId64,
                stream_class, bt_ctf_stream_class_common_get_name(stream_class),
                bt_ctf_stream_class_common_get_id(stream_class));
@@ -205,10 +187,10 @@ static inline
 void _bt_ctf_stream_class_common_set_id(
                struct bt_ctf_stream_class_common *stream_class, int64_t id)
 {
-       BT_ASSERT(stream_class);
+       BT_ASSERT_DBG(stream_class);
        stream_class->id = id;
        stream_class->id_set = 1;
-       BT_LOGV("Set stream class's ID (internal): "
+       BT_LOGT("Set stream class's ID (internal): "
                "addr=%p, name=\"%s\", id=%" PRId64,
                stream_class, bt_ctf_stream_class_common_get_name(stream_class),
                bt_ctf_stream_class_common_get_id(stream_class));
@@ -259,7 +241,7 @@ int bt_ctf_stream_class_common_set_id(struct bt_ctf_stream_class_common *stream_
 
        ret = bt_ctf_stream_class_common_set_id_no_check(stream_class, id);
        if (ret == 0) {
-               BT_LOGV("Set stream class's ID: "
+               BT_LOGT("Set stream class's ID: "
                        "addr=%p, name=\"%s\", id=%" PRId64,
                        stream_class,
                        bt_ctf_stream_class_common_get_name(stream_class),
@@ -361,7 +343,7 @@ int bt_ctf_stream_class_common_set_packet_context_field_type(
        bt_ctf_object_put_ref(stream_class->packet_context_field_type);
        stream_class->packet_context_field_type = packet_context_type;
        bt_ctf_object_get_ref(stream_class->packet_context_field_type);
-       BT_LOGV("Set stream class's packet context field type: "
+       BT_LOGT("Set stream class's packet context field type: "
                "addr=%p, name=\"%s\", id=%" PRId64 ", "
                "packet-context-ft-addr=%p",
                stream_class, bt_ctf_stream_class_common_get_name(stream_class),
@@ -382,7 +364,7 @@ bt_ctf_stream_class_common_borrow_event_header_field_type(
        BT_CTF_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 
        if (!stream_class->event_header_field_type) {
-               BT_LOGV("Stream class has no event header field type: "
+               BT_LOGT("Stream class has no event header field type: "
                        "addr=%p, name=\"%s\", id=%" PRId64,
                        stream_class,
                        bt_ctf_stream_class_common_get_name(stream_class),
@@ -438,7 +420,7 @@ int bt_ctf_stream_class_common_set_event_header_field_type(
        bt_ctf_object_put_ref(stream_class->event_header_field_type);
        stream_class->event_header_field_type = event_header_type;
        bt_ctf_object_get_ref(stream_class->event_header_field_type);
-       BT_LOGV("Set stream class's event header field type: "
+       BT_LOGT("Set stream class's event header field type: "
                "addr=%p, name=\"%s\", id=%" PRId64 ", "
                "event-header-ft-addr=%p",
                stream_class, bt_ctf_stream_class_common_get_name(stream_class),
@@ -508,7 +490,7 @@ int bt_ctf_stream_class_common_set_event_context_field_type(
        bt_ctf_object_put_ref(stream_class->event_context_field_type);
        stream_class->event_context_field_type = event_context_type;
        bt_ctf_object_get_ref(stream_class->event_context_field_type);
-       BT_LOGV("Set stream class's event context field type: "
+       BT_LOGT("Set stream class's event context field type: "
                "addr=%p, name=\"%s\", id=%" PRId64 ", "
                "event-context-ft-addr=%p",
                stream_class, bt_ctf_stream_class_common_get_name(stream_class),