X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Fust_tests_demo2.h;h=6df9e1c4e0ebe0ba4e4f2da369371d01920dcec6;hb=4e845c10b7b0549cdd0ad400509454399150c061;hp=25d42ad18eea0cdf19c96a508a0c2a666b051fe4;hpb=91c7528576191398299e36d4ac061b8a0076a643;p=lttng-tools.git

diff --git a/tests/regression/ust/linking/ust_tests_demo2.h b/tests/regression/ust/linking/ust_tests_demo2.h
index 25d42ad18..6df9e1c4e 100644
--- a/tests/regression/ust/linking/ust_tests_demo2.h
+++ b/tests/regression/ust/linking/ust_tests_demo2.h
@@ -1,58 +1,47 @@
+/*
+ * 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.
- *
- * 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 <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 */
@@ -62,7 +51,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif