|
From: <sv...@va...> - 2008-05-24 06:13:38
|
Author: bart
Date: 2008-05-24 07:13:09 +0100 (Sat, 24 May 2008)
New Revision: 8120
Log:
Changed visibility of two functions from global to static.
Modified:
branches/CROSS_COMPILATION/coregrind/m_syswrap/priv_syswrap-generic.h
branches/CROSS_COMPILATION/coregrind/m_syswrap/syswrap-generic.c
Modified: branches/CROSS_COMPILATION/coregrind/m_syswrap/priv_syswrap-generic.h
===================================================================
--- branches/CROSS_COMPILATION/coregrind/m_syswrap/priv_syswrap-generic.h 2008-05-22 14:44:39 UTC (rev 8119)
+++ branches/CROSS_COMPILATION/coregrind/m_syswrap/priv_syswrap-generic.h 2008-05-24 06:13:09 UTC (rev 8120)
@@ -64,16 +64,10 @@
/* So that it can be seen from syswrap-x86-linux.c. */
/* When a client mmap has been successfully done, both aspacem and the
tool need to be notified of the new mapping. Hence this fn. */
-extern
+extern
void
ML_(notify_aspacem_and_tool_of_mmap) ( Addr a, SizeT len, UInt prot,
UInt mm_flags, Int fd, ULong offset );
-void
-ML_(notify_aspacem_of_mmap) ( Addr a, SizeT len, UInt prot,
- UInt mm_flags, Int fd, ULong offset );
-void
-ML_(notify_tool_of_mmap) ( Addr a, SizeT len, UInt prot,
- UInt mm_flags, Int fd, ULong offset );
DECL_TEMPLATE(generic, sys_ni_syscall); // * P -- unimplemented
Modified: branches/CROSS_COMPILATION/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/CROSS_COMPILATION/coregrind/m_syswrap/syswrap-generic.c 2008-05-22 14:44:39 UTC (rev 8119)
+++ branches/CROSS_COMPILATION/coregrind/m_syswrap/syswrap-generic.c 2008-05-24 06:13:09 UTC (rev 8120)
@@ -59,6 +59,16 @@
#include "priv_syswrap-generic.h"
+/* Local function declarations. */
+
+static
+void notify_aspacem_of_mmap(Addr a, SizeT len, UInt prot,
+ UInt flags, Int fd, Off64T offset);
+static
+void notify_tool_of_mmap(Addr a, SizeT len, UInt prot,
+ UInt flags, Int fd, Off64T offset);
+
+
/* Returns True iff address range is something the client can
plausibly mess with: all of it is either already belongs to the
client or is free or a reservation. */
@@ -147,13 +157,13 @@
ML_(notify_aspacem_and_tool_of_mmap) ( Addr a, SizeT len, UInt prot,
UInt flags, Int fd, Off64T offset )
{
- ML_(notify_aspacem_of_mmap)(a, len, prot, flags, fd, offset);
- ML_(notify_tool_of_mmap)(a, len, prot, flags, fd, offset);
+ notify_aspacem_of_mmap(a, len, prot, flags, fd, offset);
+ notify_tool_of_mmap(a, len, prot, flags, fd, offset);
}
-void
-ML_(notify_aspacem_of_mmap) ( Addr a, SizeT len, UInt prot,
- UInt flags, Int fd, Off64T offset )
+static
+void notify_aspacem_of_mmap(Addr a, SizeT len, UInt prot,
+ UInt flags, Int fd, Off64T offset)
{
Bool d;
@@ -169,9 +179,9 @@
"ML_(notify_aspacem_and_tool_of_mmap)" );
}
-void
-ML_(notify_tool_of_mmap) ( Addr a, SizeT len, UInt prot,
- UInt flags, Int fd, Off64T offset )
+static
+void notify_tool_of_mmap(Addr a, SizeT len, UInt prot,
+ UInt flags, Int fd, Off64T offset)
{
Bool rr, ww, xx;
@@ -1930,7 +1940,7 @@
if (!sres.isError) {
/* Notify aspacem. */
- ML_(notify_aspacem_of_mmap)(
+ notify_aspacem_of_mmap(
(Addr)sres.res, /* addr kernel actually assigned */
arg2, arg3,
arg4, /* the original flags value */
@@ -1939,7 +1949,7 @@
/* Load symbols? */
VG_(di_notify_mmap)( (Addr)sres.res, False/*allow_SkFileV*/ );
/* Notify the tool. */
- ML_(notify_tool_of_mmap)(
+ notify_tool_of_mmap(
(Addr)sres.res, /* addr kernel actually assigned */
arg2, arg3,
arg4, /* the original flags value */
|