libelf: Use mempcpy not __mempcpy.

We were using mempcpy everywhere else, only __libelf_next_arhdr_wrlock used
__mempcpy.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index dd0a755640cee770318afa4c7d57d9d55793eed7..a9d8c6fb292267df1723f1d0e1284e69a12ed133 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-08  Mark Wielaard  <mjw@redhat.com>
+
+       * elf_begin.c (__libelf_next_arhdr_wrlock): Use mempcpy not __mempcpy.
+
 2014-11-07  Mark Wielaard  <mjw@redhat.com>
 
        * elf_begin.c (file_read_elf): Correct sh_size check.

diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c
index 5525a3b5e354651f71336c29743de63cd970ab35..d135deab15052d80a747a0320ed5cdfce3af8655 100644 (file)
--- a/libelf/elf_begin.c
+++ b/libelf/elf_begin.c
@@ -799,7 +799,7 @@ __libelf_next_arhdr_wrlock (elf)
     }
 
   /* Copy the raw name over to a NUL terminated buffer.  */
-  *((char *) __mempcpy (elf->state.ar.raw_name, ar_hdr->ar_name, 16)) = '\0';
+  *((char *) mempcpy (elf->state.ar.raw_name, ar_hdr->ar_name, 16)) = '\0';
 
   elf_ar_hdr = &elf->state.ar.elf_ar_hdr;
 
@@ -895,7 +895,7 @@ __libelf_next_arhdr_wrlock (elf)
       const char *string = ar_hdr->FIELD;                                    \
       if (ar_hdr->FIELD[sizeof (ar_hdr->FIELD) - 1] != ' ')                  \
        {                                                                     \
-         *((char *) __mempcpy (buf, ar_hdr->FIELD, sizeof (ar_hdr->FIELD)))  \
+         *((char *) mempcpy (buf, ar_hdr->FIELD, sizeof (ar_hdr->FIELD)))  \
            = '\0';                                                           \
          string = buf;                                                       \
        }                                                                     \