From 053db9608beb2dbdd428ca6ce7677ea661f244f1 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 23 May 2023 10:40:41 -0400
Subject: [PATCH] tests: convert lib conds test to C++

Rename the files from .c/.h to .cpp/.hpp.  Do some minor adjustments so
that it builds.

Change-Id: I4ab79151428ecaf37396e0da891ecd5fa10e19e9
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10053
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
---
 tests/lib/conds/Makefile.am                            |  5 ++++-
 .../lib/conds/{conds-triggers.c => conds-triggers.cpp} |  2 +-
 tests/lib/conds/{utils.c => utils.cpp}                 | 10 ++++++----
 tests/lib/conds/{utils.h => utils.hpp}                 |  0
 4 files changed, 11 insertions(+), 6 deletions(-)
 rename tests/lib/conds/{conds-triggers.c => conds-triggers.cpp} (98%)
 rename tests/lib/conds/{utils.c => utils.cpp} (93%)
 rename tests/lib/conds/{utils.h => utils.hpp} (100%)

diff --git a/tests/lib/conds/Makefile.am b/tests/lib/conds/Makefile.am
index 7b0b6d3d..2db2f811 100644
--- a/tests/lib/conds/Makefile.am
+++ b/tests/lib/conds/Makefile.am
@@ -2,7 +2,10 @@
 
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
-conds_triggers_SOURCES = conds-triggers.c utils.c utils.h
+conds_triggers_SOURCES = \
+	conds-triggers.cpp \
+	utils.cpp utils.hpp
+
 conds_triggers_LDADD = \
 	$(top_builddir)/src/common/libbabeltrace2-common.la \
 	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
diff --git a/tests/lib/conds/conds-triggers.c b/tests/lib/conds/conds-triggers.cpp
similarity index 98%
rename from tests/lib/conds/conds-triggers.c
rename to tests/lib/conds/conds-triggers.cpp
index 7a137052..4c10f380 100644
--- a/tests/lib/conds/conds-triggers.c
+++ b/tests/lib/conds/conds-triggers.cpp
@@ -7,7 +7,7 @@
 #include <babeltrace2/babeltrace.h>
 
 #include "common/assert.h"
-#include "utils.h"
+#include "utils.hpp"
 
 static
 void trigger_graph_mip_version(void)
diff --git a/tests/lib/conds/utils.c b/tests/lib/conds/utils.cpp
similarity index 93%
rename from tests/lib/conds/utils.c
rename to tests/lib/conds/utils.cpp
index 8fb5bc8f..015e09bb 100644
--- a/tests/lib/conds/utils.c
+++ b/tests/lib/conds/utils.cpp
@@ -12,7 +12,7 @@
 #include <glib.h>
 
 #include "common/assert.h"
-#include "utils.h"
+#include "utils.hpp"
 
 typedef void (* run_in_comp_cls_init_func)(
 		bt_self_component *self_comp, void *user_data);
@@ -28,7 +28,8 @@ bt_component_class_initialize_method_status comp_cls_init(
 		bt_self_component_source_configuration *conf,
 		const bt_value *params, void *init_method_data)
 {
-	struct comp_cls_init_method_data *data = init_method_data;
+	comp_cls_init_method_data *data =
+		static_cast<comp_cls_init_method_data *>(init_method_data);
 
 	/* Call user function which is expected to abort */
 	data->func(bt_self_component_source_as_self_component(self_comp),
@@ -92,7 +93,8 @@ static
 void run_in_comp_cls_init_defer(bt_self_component *self_comp,
 		void *user_data)
 {
-	cond_trigger_run_in_comp_cls_init_func user_func = user_data;
+	cond_trigger_run_in_comp_cls_init_func user_func =
+		reinterpret_cast<cond_trigger_run_in_comp_cls_init_func>(user_data);
 
 	user_func(self_comp);
 }
@@ -106,7 +108,7 @@ void run_trigger(const struct cond_trigger *trigger)
 		break;
 	case COND_TRIGGER_FUNC_TYPE_RUN_IN_COMP_CLS_INIT:
 		run_in_comp_cls_init(run_in_comp_cls_init_defer,
-			trigger->func.run_in_comp_cls_init);
+			reinterpret_cast<void *>(trigger->func.run_in_comp_cls_init));
 		break;
 	default:
 		abort();
diff --git a/tests/lib/conds/utils.h b/tests/lib/conds/utils.hpp
similarity index 100%
rename from tests/lib/conds/utils.h
rename to tests/lib/conds/utils.hpp
-- 
2.34.1