X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Ftracelog.c;h=d69301d80210d084a631c81f2193b14550965468;hb=69e21fdfdb03686626978254eb4e91ab0e2b4a38;hp=c1ed128822bd2811c0aa66b6d8fe9a95bf2dbe4b;hpb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;p=lttng-ust.git

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index c1ed1288..d69301d8 100644
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -1,35 +1,25 @@
 /*
- * Copyright (C) 2013-2014  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright (C) 2013-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #define _LGPL_SOURCE
 #include <stdio.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 #include "lttng-ust-tracelog-provider.h"
 
 #define TRACELOG_CB(level) \
-	static inline __attribute__((always_inline)) \
+	static inline \
+	void __lttng_ust_vtracelog_##level(const char *file, \
+			int line, const char *func, \
+			const char *fmt, va_list ap) \
+		__attribute__((always_inline, format(printf, 4, 0))); \
+	\
+	static inline \
 	void __lttng_ust_vtracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, va_list ap) \
@@ -48,6 +38,14 @@
 		return; \
 	} \
 	\
+	void _lttng_ust_vtracelog_##level(const char *file, \
+			int line, const char *func, \
+			const char *fmt, va_list ap) \
+		__attribute__ ((format(printf, 4, 0))); \
+	\
+	void _lttng_ust_vtracelog_##level(const char *file, \
+			int line, const char *func, \
+			const char *fmt, va_list ap); \
 	void _lttng_ust_vtracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, va_list ap) \
@@ -55,6 +53,14 @@
 		__lttng_ust_vtracelog_##level(file, line, func, fmt, ap); \
 	} \
 	\
+	void _lttng_ust_tracelog_##level(const char *file, \
+			int line, const char *func, \
+			const char *fmt, ...) \
+		__attribute__ ((format(printf, 4, 5))); \
+	\
+	void _lttng_ust_tracelog_##level(const char *file, \
+			int line, const char *func, \
+			const char *fmt, ...); \
 	void _lttng_ust_tracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, ...) \