Move to kernel style SPDX license identifiers

[lttng-ust.git] / liblttng-ust / tracelog.c

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index 65fc87ede57818c21d2af3b87ea7c8f3e133e5d7..3d48b1eddd1306f918b3f0bb4f78c1ba6306caca 100644 (file)
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -1,26 +1,9 @@
 /*
- * 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 _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <helper.h>
@@ -30,16 +13,14 @@
 #include "lttng-ust-tracelog-provider.h"
 
 #define TRACELOG_CB(level) \
-       void _lttng_ust_tracelog_##level(const char *file, \
+       static inline __attribute__((always_inline)) \
+       void __lttng_ust_vtracelog_##level(const char *file, \
                        int line, const char *func, \
-                       const char *fmt, ...) \
+                       const char *fmt, va_list ap) \
        { \
-               va_list ap; \
                char *msg; \
-               int len; \
+               const int len = vasprintf(&msg, fmt, ap); \
                \
-               va_start(ap, fmt); \
-               len = vasprintf(&msg, fmt, ap); \
                /* len does not include the final \0 */ \
                if (len < 0) \
                        goto end; \
@@ -48,6 +29,24 @@
                        LTTNG_UST_CALLER_IP()); \
                free(msg); \
        end: \
+               return; \
+       } \
+       \
+       void _lttng_ust_vtracelog_##level(const char *file, \
+                       int line, const char *func, \
+                       const char *fmt, va_list ap) \
+       { \
+               __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, ...) \
+       { \
+               va_list ap; \
+               \
+               va_start(ap, fmt); \
+               __lttng_ust_vtracelog_##level(file, line, func, fmt, ap); \
                va_end(ap); \
        }