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

diff --git a/src/lib/logging.h b/src/lib/logging.h
index f4890ce3..669b41bc 100644
--- a/src/lib/logging.h
+++ b/src/lib/logging.h
@@ -1,29 +1,12 @@
-#ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H
-#define BABELTRACE_LIB_LOGGING_INTERNAL_H
-
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- *
- * 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:
+ * SPDX-License-Identifier: MIT
  *
- * 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 2017-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
-#include "common/macros.h"
+#ifndef BABELTRACE_LIB_LOGGING_H
+#define BABELTRACE_LIB_LOGGING_H
+
 #include <stdarg.h>
 
 #ifndef BT_LOG_TAG
@@ -42,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__);			\
 		}							\
@@ -64,19 +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 *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)
@@ -98,11 +79,6 @@ void bt_lib_log(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,
@@ -110,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 */