Cleanup: bt namespace for compat strerror_r

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

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 2f15a681a8db5ccdc550e9f8ba37d13474972295..6384eee007f4d2bf922ab4a2d77dc253a49f9346 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -84,14 +84,14 @@ 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_strerror_r(errno, buf, sizeof(buf));         \
                _bt_printfe(fp, "error", buf, 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_strerror_r(errno, buf, sizeof(buf));         \
                _bt_printfle(fp, "error", lineno, buf, fmt, ## args);   \
        })
 

diff --git a/include/babeltrace/compat/string.h b/include/babeltrace/compat/string.h
index 609261613fe8d4d3d75ed833b02bb8404929ae6a..2aa7bc3ca9328b85262cbed714f587c8e9eca76b 100644 (file)
--- a/include/babeltrace/compat/string.h
+++ b/include/babeltrace/compat/string.h
@@ -30,7 +30,7 @@
 
 /* XSI-compliant strerror_r */
 static inline
-int compat_strerror_r(int errnum, char *buf, size_t buflen)
+int bt_strerror_r(int errnum, char *buf, size_t buflen)
 {
        return strerror_r(errnum, buf, buflen);
 }
@@ -39,7 +39,7 @@ int compat_strerror_r(int errnum, char *buf, size_t buflen)
 
 /* GNU-compliant strerror_r */
 static inline
-int compat_strerror_r(int errnum, char *buf, size_t buflen)
+int bt_strerror_r(int errnum, char *buf, size_t buflen)
 {
        char *retbuf;