From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 12 Mar 2021 19:05:54 +0000 (-0500)
Subject: Rename struct lttng_event_common to struct lttng_ust_event_common
X-Git-Tag: v2.13.0-rc1~302
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=7ee76145ae6a7efc03968571b9e4a22d46e92929;p=lttng-ust.git

Rename struct lttng_event_common to struct lttng_ust_event_common

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ie0c7898c8ff65f8d121ca2efb803275c08eadf99
---

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 4cc4e1e4..18102c1d 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -351,7 +351,7 @@ struct lttng_bytecode_runtime {
 
 struct lttng_ust_event_common_private;
 
-struct lttng_event_common {
+struct lttng_ust_event_common {
 	uint32_t struct_size;				/* Size of this structure. */
 	struct lttng_ust_event_common_private *priv;	/* Private event interface */
 
@@ -365,7 +365,7 @@ struct lttng_ust_event_recorder_private;
 
 struct lttng_ust_event_recorder {
 	uint32_t struct_size;				/* Size of this structure. */
-	struct lttng_event_common *parent;
+	struct lttng_ust_event_common *parent;
 	struct lttng_ust_event_recorder_private *priv;	/* Private event record interface */
 
 	unsigned int id;
diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 0971f9eb..cf6f4dad 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -774,12 +774,12 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
 	}
 	event_recorder->struct_size = sizeof(struct lttng_ust_event_recorder);
 
-	event_recorder->parent = zmalloc(sizeof(struct lttng_event_common));
+	event_recorder->parent = zmalloc(sizeof(struct lttng_ust_event_common));
 	if (!event_recorder->parent) {
 		ret = -ENOMEM;
 		goto parent_error;
 	}
-	event_recorder->parent->struct_size = sizeof(struct lttng_event_common);
+	event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
 
 	event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
 	if (!event_recorder_priv) {
diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index 45c581b1..f574be60 100644
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -166,7 +166,7 @@ struct lttng_counter_transport {
 };
 
 struct lttng_ust_event_common_private {
-	struct lttng_event_common *pub;	/* Public event interface */
+	struct lttng_ust_event_common *pub;	/* Public event interface */
 
 	const struct lttng_event_desc *desc;
 	/* Backward references: list of lttng_enabler_ref (ref to enablers) */