Commit 17e44dc4 authored Mar 23, 2015 by Arnaldo Carvalho de Melo

perf target: Simplify handling of strerror_r return



To deal with forwarding the strerror_r (GNU) return we need to check if
the returned value is the buffer we passed or maybe some constant
(unknown error), simplify that action by using scnprintf, that will do
all the buflen size checks, trimming if needed.

Acked-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-d0ik6i5gjew56j0qphql28ou@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent e1e455f4

tools/perf/util/target.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -123,11 +123,8 @@ int target__strerror(struct target *target, int errnum,
		if (errnum >= 0) {
		const char *err = strerror_r(errnum, buf, buflen);

		if (err != buf) {
		size_t len = strlen(err);
		memcpy(buf, err, min(buflen - 1, len));
		*(buf + min(buflen - 1, len)) = '\0';
		}
		if (err != buf)
		scnprintf(buf, buflen, "%s", err);

		return 0;
		}

Admin message