X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Foverlap%2Fdemo%2Fust_tests_demo2.h;h=0c39786b6650e8a6cd5047d02539fa3302e3abc5;hb=HEAD;hp=cf4424b61e8426f15557cd79b7998c979f618a1c;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32;p=lttng-tools.git

diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo2.h b/tests/regression/ust/overlap/demo/ust_tests_demo2.h
index cf4424b61..0c39786b6 100644
--- a/tests/regression/ust/overlap/demo/ust_tests_demo2.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo2.h
@@ -1,60 +1,52 @@
+/*
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER ust_tests_demo2
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@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.
- */
-
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_demo2, loop,
-	TP_ARGS(int, anint, int, netint, long *, values,
-		 char *, text, size_t, textlen,
-		 double, doublearg, float, floatarg),
-	TP_FIELDS(
-		ctf_integer(int, intfield, anint)
-		ctf_integer_hex(int, intfield2, anint)
-		ctf_integer(long, longfield, anint)
-		ctf_integer_network(int, netintfield, netint)
-		ctf_integer_network_hex(int, netintfieldhex, netint)
-		ctf_array(long, arrfield1, values, 3)
-		ctf_array_text(char, arrfield2, text, 10)
-		ctf_sequence(char, seqfield1, text,
-			     size_t, textlen)
-		ctf_sequence_text(char, seqfield2, text,
-			     size_t, textlen)
-		ctf_string(stringfield, text)
-		ctf_float(float, floatfield, floatarg)
-		ctf_float(double, doublefield, doublearg)
-	)
-)
+TRACEPOINT_EVENT(
+	ust_tests_demo2,
+	loop,
+	TP_ARGS(int,
+		anint,
+		int,
+		netint,
+		long *,
+		values,
+		char *,
+		text,
+		size_t,
+		textlen,
+		double,
+		doublearg,
+		float,
+		floatarg),
+	TP_FIELDS(ctf_integer(int, intfield, anint) ctf_integer_hex(
+		int, intfield2, anint) ctf_integer(long, longfield, anint)
+			  ctf_integer_network(int, netintfield, netint) ctf_integer_network_hex(
+				  int, netintfieldhex, netint) ctf_array(long, arrfield1, values, 3)
+				  ctf_array_text(char, arrfield2, text, 10) ctf_sequence(
+					  char, seqfield1, text, size_t, textlen)
+					  ctf_sequence_text(char, seqfield2, text, size_t, textlen)
+						  ctf_string(stringfield, text)
+							  ctf_float(float, floatfield, floatarg)
+								  ctf_float(double,
+									    doublefield,
+									    doublearg)))
 TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO2_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_demo2.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif