We were using mempcpy everywhere else, only __libelf_next_arhdr_wrlock used __mempcpy.
Signed-off-by: Mark Wielaard <[email protected]> --- libelf/ChangeLog | 4 ++++ libelf/elf_begin.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libelf/ChangeLog b/libelf/ChangeLog index dd0a755..a9d8c6f 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2014-11-08 Mark Wielaard <[email protected]> + + * elf_begin.c (__libelf_next_arhdr_wrlock): Use mempcpy not __mempcpy. + 2014-11-07 Mark Wielaard <[email protected]> * elf_begin.c (file_read_elf): Correct sh_size check. diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c index 5525a3b..d135dea 100644 --- 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; \ } \ -- 1.9.3
