|
From: <sv...@va...> - 2005-06-12 02:49:37
|
Author: njn
Date: 2005-06-12 03:49:35 +0100 (Sun, 12 Jun 2005)
New Revision: 3895
Log:
Move VG_(fcntl) into m_libcfile.
Modified:
trunk/coregrind/core.h
trunk/coregrind/m_libcfile.c
trunk/coregrind/m_libcproc.c
trunk/coregrind/pub_core_libcfile.h
Modified: trunk/coregrind/core.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/core.h 2005-06-12 02:43:17 UTC (rev 3894)
+++ trunk/coregrind/core.h 2005-06-12 02:49:35 UTC (rev 3895)
@@ -111,14 +111,7 @@
#define VG_WRAPPER(name) _vgw_##name
#define VG_WRAPPER_ALIAS(name) "_vgw_" #name
=20
-
/* ---------------------------------------------------------------------
- Exports of vg_mylibc.c
- ------------------------------------------------------------------ */
-
-extern Int VG_(fcntl) ( Int fd, Int cmd, Int arg );
-
-/* ---------------------------------------------------------------------
Exports of vg_syscall.S
------------------------------------------------------------------ */
=20
Modified: trunk/coregrind/m_libcfile.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_libcfile.c 2005-06-12 02:43:17 UTC (rev 3894)
+++ trunk/coregrind/m_libcfile.c 2005-06-12 02:49:35 UTC (rev 3895)
@@ -122,6 +122,13 @@
return res.isError ? (-1) : res.val;
}
=20
+/* Returns -1 on error. */
+Int VG_(fcntl) ( Int fd, Int cmd, Int arg )
+{
+ SysRes res =3D VG_(do_syscall3)(__NR_fcntl, fd, cmd, arg);
+ return res.isError ? -1 : res.val;
+}
+
Int VG_(rename) ( Char* old_name, Char* new_name )
{
SysRes res =3D VG_(do_syscall2)(__NR_rename, (UWord)old_name, (UWord)=
new_name);
Modified: trunk/coregrind/m_libcproc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_libcproc.c 2005-06-12 02:43:17 UTC (rev 3894)
+++ trunk/coregrind/m_libcproc.c 2005-06-12 02:49:35 UTC (rev 3895)
@@ -224,13 +224,6 @@
return res.isError ? -1 : res.val;
}
=20
-/* Returns -1 on error. */
-Int VG_(fcntl) ( Int fd, Int cmd, Int arg )
-{
- SysRes res =3D VG_(do_syscall3)(__NR_fcntl, fd, cmd, arg);
- return res.isError ? -1 : res.val;
-}
-
Int VG_(poll)( struct vki_pollfd *ufds, UInt nfds, Int timeout)
{
SysRes res =3D VG_(do_syscall3)(__NR_poll, (UWord)ufds, nfds, timeout=
);
Modified: trunk/coregrind/pub_core_libcfile.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/pub_core_libcfile.h 2005-06-12 02:43:17 UTC (rev 3894=
)
+++ trunk/coregrind/pub_core_libcfile.h 2005-06-12 02:49:35 UTC (rev 3895=
)
@@ -43,7 +43,8 @@
extern Int VG_(fd_hard_limit);
=20
/* Move an fd into the Valgrind-safe range */
-extern Int VG_(safe_fd)(Int oldfd);
+extern Int VG_(safe_fd) ( Int oldfd );
+extern Int VG_(fcntl) ( Int fd, Int cmd, Int arg );
=20
extern Int VG_(write_socket)( Int sd, void *msg, Int count );
extern Int VG_(connect_via_socket)( UChar* str );
|