From 695f152d09b677dab15e38dd5d33d829d8d9acb8 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 14 Sep 2016 20:32:27 -0400 Subject: [PATCH] Cleanup: bt namespace for compat strerror_r MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- include/babeltrace/babeltrace-internal.h | 4 ++-- include/babeltrace/compat/string.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h index 2f15a681..6384eee0 100644 --- 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 60926161..2aa7bc3c 100644 --- 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; -- 2.34.1