X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flogging.h;h=aa4fc5e501e7748ae6b578d2bf0268907b3aed58;hb=HEAD;hp=8462e47cb782787868d02ad9f04c286cb7f8bbb7;hpb=e020d1340a9b5ebd7d7dbf00a2c34d2fe512a495;p=babeltrace.git

diff --git a/src/lib/logging.h b/src/lib/logging.h
index 8462e47c..669b41bc 100644
--- a/src/lib/logging.h
+++ b/src/lib/logging.h
@@ -4,10 +4,9 @@
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
-#ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H
-#define BABELTRACE_LIB_LOGGING_INTERNAL_H
+#ifndef BABELTRACE_LIB_LOGGING_H
+#define BABELTRACE_LIB_LOGGING_H
 
-#include "common/macros.h"
 #include <stdarg.h>
 
 #ifndef BT_LOG_TAG
@@ -26,7 +25,7 @@ int bt_lib_log_level;
 #define BT_LIB_LOG(_lvl, _fmt, ...)					\
 	do {								\
 		if (BT_LOG_ON(_lvl)) {					\
-			bt_lib_log(_BT_LOG_SRCLOC_FUNCTION, __FILE__,	\
+			bt_lib_log(__FILE__, __func__,			\
 				__LINE__, _lvl, _BT_LOG_TAG,		\
 				(_fmt), ##__VA_ARGS__);			\
 		}							\
@@ -48,22 +47,17 @@ int bt_lib_log_level;
  *
  * Use one of the BT_LIB_LOG*() macros above instead of calling this
  * function directly.
- *
- * This function would normally be BT_HIDDEN, but it is used by the Python
- * plugin provider, which is conceptually part of libbabeltrace2, but
- * implemented as a separate shared object, for modularity.  It is therefore
- * exposed, but not part of the public ABI.
  */
-void bt_lib_log(const char *func, const char *file, unsigned line,
+void bt_lib_log(const char *file, const char *func, unsigned line,
 		int lvl, const char *tag, const char *fmt, ...);
 
-void bt_lib_log_v(const char *func, const char *file, unsigned line,
+void bt_lib_log_v(const char *file, const char *func, unsigned line,
 		int lvl, const char *tag, const char *fmt, va_list *args);
 
 #define BT_LIB_LOG_AND_APPEND(_lvl, _fmt, ...)				\
 	do {								\
 		bt_lib_maybe_log_and_append_cause(			\
-			_BT_LOG_SRCLOC_FUNCTION, __FILE__,		\
+			__func__, __FILE__,				\
 			__LINE__, _lvl, _BT_LOG_TAG,			\
 			(_fmt), ##__VA_ARGS__);				\
 	} while (0)
@@ -85,11 +79,6 @@ void bt_lib_log_v(const char *func, const char *file, unsigned line,
  *
  * Use one of the BT_LIB_LOG*_APPEND_CAUSE() macros above instead of
  * calling this function directly.
- *
- * This function would normally be BT_HIDDEN, but it is used by the Python
- * plugin provider, which is conceptually part of libbabeltrace2, but
- * implemented as a separate shared object, for modularity.  It is therefore
- * exposed, but not part of the ABI.
  */
 void bt_lib_maybe_log_and_append_cause(const char *func, const char *file,
 		unsigned line, int lvl, const char *tag,
@@ -97,4 +86,4 @@ void bt_lib_maybe_log_and_append_cause(const char *func, const char *file,
 
 #define BT_LIB_LOG_SUPPORTED
 
-#endif /* BABELTRACE_LIB_LOGGING_INTERNAL_H */
+#endif /* BABELTRACE_LIB_LOGGING_H */