Namespace police

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

diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index ae9f98d9e0867286e0eedf205633271682129359..f53bf97143907a60cf841efd005c5696fe893ee4 100644 (file)
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -79,7 +79,7 @@ typedef
 /*--- Output file related stuff                            ---*/
 /*------------------------------------------------------------*/
 
-Char cachegrind_out_file[FILENAME_LEN];
+static Char cachegrind_out_file[FILENAME_LEN];
 
 static void file_err ( void )
 {

diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c
index 76b9439594b3c316b1f53b5872dae989368dc83e..8de283abc04e05e751d10691e6a18b8a858e0d60 100644 (file)
--- a/coregrind/vg_errcontext.c
+++ b/coregrind/vg_errcontext.c
@@ -247,6 +247,7 @@ void VG_(gen_suppression)(Error* err)
    VG_(printf)("}\n");
 }
 
+static 
 void do_actions_on_error(Error* err, Bool allow_GDB_attach,
                          Addr m_eip, Addr m_esp, Addr m_ebp )
 {

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index 9aa38b594c649934435d67802477d175c6dcf793..f16cf630b1e46cdb9b9a07242d6c6f1dd9988445 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -913,6 +913,7 @@ void free_LockSet(LockSet *p)
    VG_(free)(p);
 }
 
+static
 void pp_all_LockSets ( void )
 {
    Int i;
@@ -1804,7 +1805,7 @@ void init_shadow_memory(void)
 /*--- malloc() et al replacements                          ---*/
 /*------------------------------------------------------------*/
 
-VgHashTable hg_malloc_list = NULL;
+static VgHashTable hg_malloc_list = NULL;
 
 #define N_FREED_CHUNKS 2
 static Int freechunkptr = 0;

diff --git a/memcheck/mac_needs.c b/memcheck/mac_needs.c
index 84c778c8ddeb5f0687d3091f9d3a7ea3551b516f..1440645fe49e13f5eae626d2301c56321ef230b8 100644 (file)
--- a/memcheck/mac_needs.c
+++ b/memcheck/mac_needs.c
@@ -704,14 +704,14 @@ M  89   fpu_write 10/28/108
 
 UInt MAC_(event_ctr)[N_PROF_EVENTS];
 
-void init_prof_mem ( void )
+static void init_prof_mem ( void )
 {
    Int i;
    for (i = 0; i < N_PROF_EVENTS; i++)
       MAC_(event_ctr)[i] = 0;
 }
 
-void done_prof_mem ( void )
+static void done_prof_mem ( void )
 {
    Int i;
    for (i = 0; i < N_PROF_EVENTS; i++) {
@@ -725,8 +725,8 @@ void done_prof_mem ( void )
 
 #else
 
-void init_prof_mem ( void ) { }
-void done_prof_mem ( void ) { }
+static void init_prof_mem ( void ) { }
+static void done_prof_mem ( void ) { }
 
 #endif