X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Ftracef.c;h=e321ee07a497c3043243f7d8199a26d423743a5a;hb=b2e37d27accf5e32128b82392dbe1a9522c7dc20;hp=e48ef802c1cdbddc41aa9e49435e9e1b2d7f64fe;hpb=0274f7f24e55825f2a51804d50100676d468c06d;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/tracef.c b/src/lib/lttng-ust/tracef.c
index e48ef802..e321ee07 100644
--- a/src/lib/lttng-ust/tracef.c
+++ b/src/lib/lttng-ust/tracef.c
@@ -8,15 +8,15 @@
 #include <stdio.h>
 #include "common/macros.h"
 
-#define TRACEPOINT_CREATE_PROBES
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "lttng-ust-tracef-provider.h"
 
 static inline
-void __lttng_ust_vtracef(const char *fmt, va_list ap)
+void lttng_ust___vtracef(const char *fmt, va_list ap)
 	__attribute__((always_inline, format(printf, 1, 0)));
 static inline
-void __lttng_ust_vtracef(const char *fmt, va_list ap)
+void lttng_ust___vtracef(const char *fmt, va_list ap)
 {
 	char *msg;
 	const int len = vasprintf(&msg, fmt, ap);
@@ -31,25 +31,20 @@ end:
 	return;
 }
 
-/*
- * FIXME: We should include <lttng/tracef.h> for the declarations here, but it
- * fails with tracepoint magic above my paygrade.
- */
-
-void _lttng_ust_vtracef(const char *fmt, va_list ap)
+void lttng_ust__vtracef(const char *fmt, va_list ap)
 	__attribute__((format(printf, 1, 0)));
-void _lttng_ust_vtracef(const char *fmt, va_list ap)
+void lttng_ust__vtracef(const char *fmt, va_list ap)
 {
-	__lttng_ust_vtracef(fmt, ap);
+	lttng_ust___vtracef(fmt, ap);
 }
 
-void _lttng_ust_tracef(const char *fmt, ...)
+void lttng_ust__tracef(const char *fmt, ...)
 	__attribute__((format(printf, 1, 2)));
-void _lttng_ust_tracef(const char *fmt, ...)
+void lttng_ust__tracef(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	__lttng_ust_vtracef(fmt, ap);
+	lttng_ust___vtracef(fmt, ap);
 	va_end(ap);
 }