From 72e944a41ee5bf9144ff840d201b8f98a47f9a49 Mon Sep 17 00:00:00 2001
From: Irina Tirdea <irina.tirdea@intel.com>
Date: Sat, 8 Sep 2012 03:43:22 +0300
Subject: [PATCH] --- yaml --- r: 323783 b: refs/heads/master c:
 9612ef6716efc20fac0f57d59452cda4e6846bda h: refs/heads/master i:   323781:
 59943ac48e07d765e76d4d52029f855f74c8f00a   323779:
 92e174b2f673900a10069d5fca5cad5dde068676   323775:
 a220519971ba39c852d140fefc61856642fd5afd v: v3

---
 [refs]                                   | 2 +-
 trunk/tools/lib/traceevent/event-parse.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7a391bb178d0..78fc2a7c6602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b45f21c2e42f265f6fd469e43857e98e2fdf01c
+refs/heads/master: 9612ef6716efc20fac0f57d59452cda4e6846bda
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 4595aeb3c432..f4190b5764de 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -4833,8 +4833,8 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum,
 		msg = strerror_r(errnum, buf, buflen);
 		if (msg != buf) {
 			size_t len = strlen(msg);
-			char *c = mempcpy(buf, msg, min(buflen-1, len));
-			*c = '\0';
+			memcpy(buf, msg, min(buflen - 1, len));
+			*(buf + min(buflen - 1, len)) = '\0';
 		}
 		return 0;
 	}