tools: Introduce str_error_r()

The tools so far have been using the strerror_r() GNU variant, that
returns a string, be it the buffer passed or something else.

But that, besides being tricky in cases where we expect that the
function using strerror_r() returns the error formatted in a provided
buffer (we have to check if it returned something else and copy that
instead), breaks the build on systems not using glibc, like Alpine
Linux, where musl libc is used.

So, introduce yet another wrapper, str_error_r(), that has the GNU
interface, but uses the portable XSI variant of strerror_r(), so that
users rest asured that the provided buffer is used and it is what is
returned.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d4t42fnf48ytlk8rjxs822tf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
index 5b563b2e8b1d..98398b55a03f 100644
--- a/tools/perf/util/probe-file.c
+++ b/tools/perf/util/probe-file.c
@@ -50,7 +50,7 @@ static void print_open_warning(int err, bool uprobe)
         else
                 pr_warning("Failed to open %cprobe_events: %s\n",
                            uprobe ? 'u' : 'k',
-                           strerror_r(-err, sbuf, sizeof(sbuf)));
+                           str_error_r(-err, sbuf, sizeof(sbuf)));
 }
 
 static void print_both_open_warning(int kerr, int uerr)
@@ -64,9 +64,9 @@ static void print_both_open_warning(int kerr, int uerr)
         else {
                 char sbuf[STRERR_BUFSIZE];
                 pr_warning("Failed to open kprobe events: %s.\n",
-                           strerror_r(-kerr, sbuf, sizeof(sbuf)));
+                           str_error_r(-kerr, sbuf, sizeof(sbuf)));
                 pr_warning("Failed to open uprobe events: %s.\n",
-                           strerror_r(-uerr, sbuf, sizeof(sbuf)));
+                           str_error_r(-uerr, sbuf, sizeof(sbuf)));
         }
 }
 
@@ -224,7 +224,7 @@ int probe_file__add_event(int fd, struct probe_trace_event *tev)
                 if (write(fd, buf, strlen(buf)) < (int)strlen(buf)) {
                         ret = -errno;
                         pr_warning("Failed to write event: %s\n",
-                                   strerror_r(errno, sbuf, sizeof(sbuf)));
+                                   str_error_r(errno, sbuf, sizeof(sbuf)));
                 }
         }
         free(buf);
@@ -262,7 +262,7 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
         return 0;
 error:
         pr_warning("Failed to delete event: %s\n",
-                   strerror_r(-ret, buf, sizeof(buf)));
+                   str_error_r(-ret, buf, sizeof(buf)));
         return ret;
 }