From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 2 Mar 1998 13:40:38 +0000 (+0000)
Subject: (_strerror_internal): Use memcpy instead of __mempcpy.
X-Git-Tag: cvs/before-sparc-2_0_x-branch~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bc80efede67b440daf07f86c68fcf7fe51660b;p=thirdparty%2Fglibc.git

(_strerror_internal): Use memcpy instead of __mempcpy.
---

diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c
index 7bca7e8bd99..2ec89610477 100644
--- a/sysdeps/mach/_strerror.c
+++ b/sysdeps/mach/_strerror.c
@@ -62,7 +62,8 @@ _strerror_internal (int errnum, char *buf, size_t buflen)
 
       /* Now construct the result while taking care for the destination
 	 buffer size.  */
-      q = __mempcpy (buf, unk, MIN (unklen, buflen));
+      q = memcpy (buf, unk, MIN (unklen, buflen));
+      q += MIN (unklen, buflen);
       if (unklen < buflen)
 	__stpncpy (q, p, buflen - unklen);
 
@@ -93,11 +94,13 @@ _strerror_internal (int errnum, char *buf, size_t buflen)
 
       /* Now construct the result while taking care for the destination
 	 buffer size.  */
-      q = __mempcpy (buf, unk, MIN (unklen, buflen));
+      q = memcpy (buf, unk, MIN (unklen, buflen));
+      q += MIN (unklen, buflen);
       if (unklen < buflen)
 	{
-	  q = __mempcpy (q, es->subsystem[sub].subsys_name,
-			 MIN (len, buflen - unklen));
+	  q = memcpy (q, es->subsystem[sub].subsys_name,
+		      MIN (len, buflen - unklen));
+	  q += MIN (len, buflen - unklen);
 	  if (unklen + len < buflen)
 	    {
 	      *q++ = ' ';