From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 7 Jul 2017 20:58:48 +0000 (+0000)
Subject: Port: replace strerror_r() by g_strerror()
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=0550901200156da07befb55b3aa23e0180d959e2

Port: replace strerror_r() by g_strerror()

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/babeltrace/logging-internal.h b/include/babeltrace/logging-internal.h
index 382e8b80..08161030 100644
--- a/include/babeltrace/logging-internal.h
+++ b/include/babeltrace/logging-internal.h
@@ -837,25 +837,12 @@ void _bt_log_write_mem_aux(
 			} _BT_LOG_ONCE
 #endif
 
-#if (_POSIX_C_SOURCE >= 200112L) && !  _GNU_SOURCE
-	/* XSI-compliant version of strerror_r(). */
-	#define BT_LOG_WRITE_ERRNO(lvl, tag, _msg, _fmt, args...) \
-			do { \
-				char error_str[BUFSIZ]; \
-				memset(error_str, 0, sizeof(error_str)); \
-				(void) strerror_r(errno, error_str, sizeof(error_str)); \
-				BT_LOG_WRITE(lvl, tag, _msg ": %s" _fmt, error_str, ## args); \
-			} _BT_LOG_ONCE
-#else
-	/* GNU version of strerror_r(). */
-	#define BT_LOG_WRITE_ERRNO(lvl, tag, _msg, _fmt, args...) \
-			do { \
-				char error_str_buf[BUFSIZ]; \
-				char *error_str; \
-				error_str = strerror_r(errno, error_str_buf, sizeof(error_str_buf)); \
-				BT_LOG_WRITE(lvl, tag, _msg ": %s" _fmt, error_str, ## args); \
-			} _BT_LOG_ONCE
-#endif
+#define BT_LOG_WRITE_ERRNO(lvl, tag, _msg, _fmt, args...) \
+		do { \
+			const char *error_str; \
+			error_str = g_strerror(errno); \
+			BT_LOG_WRITE(lvl, tag, _msg ": %s" _fmt, error_str, ## args); \
+		} _BT_LOG_ONCE
 
 static _BT_LOG_INLINE void _bt_log_unused(const int dummy, ...) {(void)dummy;}