License text standardization, add missing licenses

[lttng-ust.git] / tests / demo / ust_tests_demo2.h

diff --git a/tests/demo/ust_tests_demo2.h b/tests/demo/ust_tests_demo2.h
index 3cadfa8c281ee868218c1cc829ff208f4ce52413..97a55a2123aaeb74a823542fb32c863de9a85bed 100644 (file)
--- a/tests/demo/ust_tests_demo2.h
+++ b/tests/demo/ust_tests_demo2.h
@@ -11,24 +11,19 @@ extern "C" {
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * 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:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * 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_LOGLEVEL_ENUM(
-       tp_loglevel(other, 0)
-       tp_loglevel(other2, 1)
-       tp_loglevel(other3, 2)
-)
-
 TRACEPOINT_EVENT(ust_tests_demo2, loop,
        TP_ARGS(int, anint, int, netint, long *, values,
                 char *, text, size_t, textlen,
@@ -50,7 +45,7 @@ TRACEPOINT_EVENT(ust_tests_demo2, loop,
                ctf_float(double, doublefield, doublearg)
        )
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, other3)
+TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO2_H */