|
From: <sv...@va...> - 2014-11-23 12:21:40
|
Author: sewardj
Date: Sun Nov 23 12:21:33 2014
New Revision: 14749
Log:
Merge, from trunk, r14599
339645 Use correct tag names in sys_getdents/64 wrappers
Modified:
branches/VALGRIND_3_10_BRANCH/ (props changed)
branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-generic.c
Modified: branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-generic.c
==============================================================================
--- branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-generic.c (original)
+++ branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-generic.c Sun Nov 23 12:21:33 2014
@@ -3242,7 +3242,7 @@
*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 @@
*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 );
}
|