Move to kernel style SPDX license identifiers

[babeltrace.git] / src / lib / graph / component-source.c

diff --git a/src/lib/graph/component-source.c b/src/lib/graph/component-source.c
index c7c01ab1038ff9c1029f1ae1c707725db57876ed..ed3da16016767df8d9be72b6f8936489a602780c 100644 (file)
--- a/src/lib/graph/component-source.c
+++ b/src/lib/graph/component-source.c
@@ -1,41 +1,25 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2015 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.
- *
- * 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.
  */
 
-#define BT_LOG_TAG "COMP-SOURCE"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/COMPONENT-SOURCE"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
 #include "compat/compiler.h"
-#include <babeltrace2/graph/self-component-source.h>
-#include <babeltrace2/graph/component-source-const.h>
-#include <babeltrace2/graph/message-iterator-const.h>
+#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/graph.h>
 
 #include "component-source.h"
 #include "component.h"
 #include "port.h"
 #include "message/iterator.h"
+#include "lib/func-status.h"
 
 BT_HIDDEN
 void bt_component_source_destroy(struct bt_component *component)
@@ -48,9 +32,12 @@ struct bt_component *bt_component_source_create(
 {
        struct bt_component_source *source = NULL;
 
+       BT_ASSERT_PRE_NO_ERROR();
+
        source = g_new0(struct bt_component_source, 1);
        if (!source) {
-               BT_LOGE_STR("Failed to allocate one source component.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one source component.");
                goto end;
        }
 
@@ -64,12 +51,12 @@ bt_component_source_borrow_class_const(
 {
        struct bt_component_class *cls;
 
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
 
        cls = component->parent.class;
 
-       BT_ASSERT(cls);
-       BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_SOURCE);
+       BT_ASSERT_DBG(cls);
+       BT_ASSERT_DBG(cls->type == BT_COMPONENT_CLASS_TYPE_SOURCE);
 
        return (bt_component_class_source *) cls;
 }
@@ -110,25 +97,26 @@ bt_self_component_source_borrow_output_port_by_index(
                (void *) comp, index);
 }
 
-enum bt_self_component_status bt_self_component_source_add_output_port(
+enum bt_self_component_add_port_status bt_self_component_source_add_output_port(
                struct bt_self_component_source *self_comp,
                const char *name, void *user_data,
                struct bt_self_component_port_output **self_port)
 {
        struct bt_component *comp = (void *) self_comp;
-       enum bt_self_component_status status;
+       enum bt_self_component_add_port_status status;
        struct bt_port *port = NULL;
 
+       BT_ASSERT_PRE_NO_ERROR();
+
        /* bt_component_add_output_port() logs details and errors */
        status = bt_component_add_output_port(comp, name, user_data, &port);
-       if (status != BT_SELF_COMPONENT_STATUS_OK) {
+       if (status != BT_FUNC_STATUS_OK) {
                goto end;
        }
 
        if (self_port) {
                /* Move reference to user */
                *self_port = (void *) port;
-               port = NULL;
        }
 
 end: