X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin.h;h=60db3aaaf2d22b2ee69c676441dc04671815cf3d;hb=5a3fec55322bf221441f86d5ffedeb049d08d200;hp=ba4f45516ed921a2e58c36192aa8a588939a89c4;hpb=577fa92f184fd2d75fb0697e879ab563de117c2e;p=babeltrace.git

diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h
index ba4f4551..60db3aaa 100644
--- a/src/lib/plugin/plugin.h
+++ b/src/lib/plugin/plugin.h
@@ -1,37 +1,22 @@
-#ifndef BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
-#define BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
-
 /*
+ * 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.
  */
 
-#include "common/macros.h"
+#ifndef BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
+#define BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
+
+#include "common/common.h"
 #include "lib/graph/component-class.h"
-#include <babeltrace2/plugin/plugin-const.h>
+#include <babeltrace2/plugin/plugin-loading.h>
 #include <babeltrace2/plugin/plugin-dev.h>
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include "common/assert.h"
 #include <glib.h>
+#include <stdbool.h>
 
 #include "plugin-so.h"
 #include "lib/func-status.h"
@@ -93,9 +78,9 @@ const char *bt_plugin_type_string(enum bt_plugin_type type)
 {
 	switch (type) {
 	case BT_PLUGIN_TYPE_SO:
-		return "BT_PLUGIN_TYPE_SO";
+		return "SO";
 	case BT_PLUGIN_TYPE_PYTHON:
-		return "BT_PLUGIN_TYPE_PYTHON";
+		return "PYTHON";
 	default:
 		return "(unknown)";
 	}
@@ -348,7 +333,7 @@ int bt_plugin_add_component_class(
 		comp_classes = plugin->sink_comp_classes;
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	/* Set component class's original plugin name */