lib: append `_FUNC` to `BT_PLUGIN_{INITIALIZE,FINALIZE}*`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie643815f2ec07149025d864324e6aefc55a14cd5
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2750
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>

diff --git a/include/babeltrace2/plugin/plugin-dev.h b/include/babeltrace2/plugin/plugin-dev.h
index f2e7a079393a322d51c1bc58ba751c20e01a5438..8405037c95eb9ce8aec9969793f1c9f254dbd36d 100644 (file)
--- a/include/babeltrace2/plugin/plugin-dev.h
+++ b/include/babeltrace2/plugin/plugin-dev.h
@@ -443,7 +443,7 @@ struct __bt_plugin_component_class_descriptor_attribute const * const *__bt_get_
  * _id: Plugin descriptor ID (C identifier).
  * _x:  Initialization function (bt_plugin_initialize_func).
  */
-#define BT_PLUGIN_INITIALIZE_WITH_ID(_id, _x) \
+#define BT_PLUGIN_INITIALIZE_FUNC_WITH_ID(_id, _x) \
        __BT_PLUGIN_DESCRIPTOR_ATTRIBUTE(init, BT_PLUGIN_DESCRIPTOR_ATTRIBUTE_TYPE_INIT, _id, _x)
 
 /*
@@ -453,7 +453,7 @@ struct __bt_plugin_component_class_descriptor_attribute const * const *__bt_get_
  * _id: Plugin descriptor ID (C identifier).
  * _x:  Exit function (bt_plugin_finalize_func).
  */
-#define BT_PLUGIN_FINALIZE_WITH_ID(_id, _x) \
+#define BT_PLUGIN_FINALIZE_FUNC_WITH_ID(_id, _x) \
        __BT_PLUGIN_DESCRIPTOR_ATTRIBUTE(exit, BT_PLUGIN_DESCRIPTOR_ATTRIBUTE_TYPE_EXIT, _id, _x)
 
 /*
@@ -954,7 +954,7 @@ struct __bt_plugin_component_class_descriptor_attribute const * const *__bt_get_
  *
  * _x: Initialization function (bt_plugin_initialize_func).
  */
-#define BT_PLUGIN_INITIALIZE(_x)       BT_PLUGIN_INITIALIZE_WITH_ID(auto, _x)
+#define BT_PLUGIN_INITIALIZE_FUNC(_x)  BT_PLUGIN_INITIALIZE_FUNC_WITH_ID(auto, _x)
 
  /*
  * Defines a plugin exit function attribute attached to the automatic
@@ -962,7 +962,7 @@ struct __bt_plugin_component_class_descriptor_attribute const * const *__bt_get_
  *
  * _x: Exit function (bt_plugin_finalize_func).
  */
-#define BT_PLUGIN_FINALIZE(_x)                 BT_PLUGIN_FINALIZE_WITH_ID(auto, _x)
+#define BT_PLUGIN_FINALIZE_FUNC(_x)    BT_PLUGIN_FINALIZE_FUNC_WITH_ID(auto, _x)
 
 /*
  * Defines an author attribute attached to the automatic plugin

diff --git a/tests/lib/test-plugin-plugins/minimal.c b/tests/lib/test-plugin-plugins/minimal.c
index 661c7528490b0966111aed9f0fef7409bcb5790c..1d7c45b62b5523359f74449aa87342710de0ef56 100644 (file)
--- a/tests/lib/test-plugin-plugins/minimal.c
+++ b/tests/lib/test-plugin-plugins/minimal.c
@@ -35,5 +35,5 @@ BT_PLUGIN(test_minimal);
 BT_PLUGIN_DESCRIPTION("Minimal Babeltrace plugin with no component classes");
 BT_PLUGIN_AUTHOR("Janine Sutto");
 BT_PLUGIN_LICENSE("Beerware");
-BT_PLUGIN_INITIALIZE(plugin_init);
-BT_PLUGIN_FINALIZE(plugin_finalize);
+BT_PLUGIN_INITIALIZE_FUNC(plugin_init);
+BT_PLUGIN_FINALIZE_FUNC(plugin_finalize);