Port: replace strerror_r() with glib g_strerror()

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

diff --git a/configure.ac b/configure.ac
index 56255d0a98019ef2bf6614390fd37c7d10307778..6d097bb6f8bfeae24727ab114509db16b0967ec4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,6 @@ AC_FUNC_MALLOC
 AC_FUNC_MKTIME
 AC_FUNC_MMAP
 AC_FUNC_REALLOC
-AC_FUNC_STRERROR_R
 AC_CHECK_FUNCS([ \
        atexit \
        dirfd \

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index a903c686965a8bdc918946557c8cdedd6a21fa3c..0e73cdbf1f4696164e2c1591a0aaab2934bc042e 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -83,16 +83,16 @@ extern int babeltrace_verbose, babeltrace_debug;
 
 #define _bt_printf_perror(fp, fmt, args...)                            \
        ({                                                              \
-               char buf[PERROR_BUFLEN] = "Error in strerror_r()";      \
-               compat_strerror_r(errno, buf, sizeof(buf));             \
-               _bt_printfe(fp, "error", buf, fmt, ## args);            \
+               const char *errstr;                                     \
+               errstr = g_strerror(errno);                             \
+               _bt_printfe(fp, "error", errstr, fmt, ## args);         \
        })
 
 #define _bt_printfl_perror(fp, lineno, fmt, args...)                   \
        ({                                                              \
-               char buf[PERROR_BUFLEN] = "Error in strerror_r()";      \
-               compat_strerror_r(errno, buf, sizeof(buf));             \
-               _bt_printfle(fp, "error", lineno, buf, fmt, ## args);   \
+               const char *errstr;                                     \
+               errstr = g_strerror(errno);                             \
+               _bt_printfle(fp, "error", lineno, errstr, fmt, ## args);\
        })
 
 /* printf without lineno information */

diff --git a/include/babeltrace/compat/string.h b/include/babeltrace/compat/string.h
index 609261613fe8d4d3d75ed833b02bb8404929ae6a..c3325a3b11a6c654f56af4badeb0c1ef3dab23cf 100644 (file)
--- a/include/babeltrace/compat/string.h
+++ b/include/babeltrace/compat/string.h
@@ -26,32 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
-
-/* XSI-compliant strerror_r */
-static inline
-int compat_strerror_r(int errnum, char *buf, size_t buflen)
-{
-       return strerror_r(errnum, buf, buflen);
-}
-
-#else
-
-/* GNU-compliant strerror_r */
-static inline
-int compat_strerror_r(int errnum, char *buf, size_t buflen)
-{
-       char *retbuf;
-
-       retbuf = strerror_r(errnum, buf, buflen);
-       if (retbuf != buf)
-               strncpy(buf, retbuf, buflen);
-       buf[buflen - 1] = '\0';
-       return 0;
-}
-
-#endif
-
 #ifdef HAVE_STRNLEN
 static inline
 size_t bt_strnlen(const char *str, size_t max)