[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-mixgnh3iyajuqogn2opsocdy@git.kernel.org>
Date: Wed, 13 Jul 2016 00:13:18 -0700
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: jolsa@...nel.org, acme@...hat.com, tglx@...utronix.de,
rostedt@...dmis.org, adrian.hunter@...el.com, dsahern@...il.com,
namhyung@...nel.org, linux-kernel@...r.kernel.org,
mingo@...nel.org, wangnan0@...wei.com, hpa@...or.com
Subject: [tip:perf/core] tools lib api fs: Use str_error_r()
Commit-ID: b31e3e3316a78e4a2cf23be8e0d47e5e5a025bde
Gitweb: http://git.kernel.org/tip/b31e3e3316a78e4a2cf23be8e0d47e5e5a025bde
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Fri, 8 Jul 2016 15:26:50 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 12 Jul 2016 15:20:29 -0300
tools lib api fs: Use str_error_r()
To make it portable to non-glibc systems, that follow the XSI variant
instead of the GNU specific one that gets in place when _GNU_SOURCE is
defined.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/n/tip-mixgnh3iyajuqogn2opsocdy@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/lib/api/Makefile | 1 +
tools/lib/api/fs/tracing_path.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index c7ceea6..0a6fda9 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -26,6 +26,7 @@ endif
CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS += -I$(srctree)/tools/lib/api
+CFLAGS += -I$(srctree)/tools/include
RM = rm -f
diff --git a/tools/lib/api/fs/tracing_path.c b/tools/lib/api/fs/tracing_path.c
index a26bb5e..251b7c3 100644
--- a/tools/lib/api/fs/tracing_path.c
+++ b/tools/lib/api/fs/tracing_path.c
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <linux/string.h>
#include <errno.h>
#include <unistd.h>
#include "fs.h"
@@ -118,7 +119,7 @@ static int strerror_open(int err, char *buf, size_t size, const char *filename)
}
break;
default:
- snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf)));
+ snprintf(buf, size, "%s", str_error_r(err, sbuf, sizeof(sbuf)));
break;
}
Powered by blists - more mailing lists