From: Florian Krohm <florian@eich-krohm.de>
Date: Sat, 4 Oct 2014 21:32:06 +0000 (+0000)
Subject: Use correct tag names in sys_getdents/64 wrappers.
X-Git-Tag: svn/VALGRIND_3_11_0~943
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5658acec7e0082a6e8e27a94a67b0a07fe092dfb;p=thirdparty%2Fvalgrind.git

Use correct tag names in sys_getdents/64 wrappers.
Patch by Ivo Raisr (ivosh@ivosh.net).
Fixes BZ #339645


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14599
---

diff --git a/NEWS b/NEWS
index f1a13eebd4..a9c16fa4a5 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ where XXXXXX is the bug number as listed below.
 339020 ppc64: memcheck/tests/ppc64/power_ISA2_05 failing in nightly build
 339156 gdbsrv not called for fatal signal
 339442 Fix testsuite build failure on OS X 10.9
+339645 Use correct tag names in sys_getdents/64 wrappers
 n-i-bz Old STABS code is still being compiled, but never used. Remove it.
 n-i-bz Fix compilation on distros with glibc < 2.5
 339182 ppc64: AvSplat ought to load destination vector register with 16/16
diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 0fa172cda3..8676e7c9a1 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3242,7 +3242,7 @@ PRE(sys_getdents)
    *flags |= SfMayBlock;
    PRINT("sys_getdents ( %ld, %#lx, %ld )", ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "getdents",
-                 unsigned int, fd, struct linux_dirent *, dirp,
+                 unsigned int, fd, struct vki_dirent *, dirp,
                  unsigned int, count);
    PRE_MEM_WRITE( "getdents(dirp)", ARG2, ARG3 );
 }
@@ -3259,7 +3259,7 @@ PRE(sys_getdents64)
    *flags |= SfMayBlock;
    PRINT("sys_getdents64 ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "getdents64",
-                 unsigned int, fd, struct linux_dirent64 *, dirp,
+                 unsigned int, fd, struct vki_dirent64 *, dirp,
                  unsigned int, count);
    PRE_MEM_WRITE( "getdents64(dirp)", ARG2, ARG3 );
 }