Remove some unnecessary #includes, comment some others.

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

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 3a60fb98093678f6a911883d2afbe7673d369f6e..fe30e08b4e1263a39ae734fac322dad84740dd20 100644 (file)
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -29,7 +29,7 @@
 */
 
 #include "pub_core_basics.h"
-#include "pub_core_threadstate.h"
+#include "pub_core_threadstate.h"      // For VG_N_THREADS
 #include "pub_core_debugger.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_errormgr.h"
@@ -38,12 +38,11 @@
 #include "pub_core_libcassert.h"
 #include "pub_core_libcfile.h"
 #include "pub_core_libcprint.h"
-#include "pub_core_libcproc.h"
+#include "pub_core_libcproc.h"         // For VG_(getpid)()
 #include "pub_core_mallocfree.h"
 #include "pub_core_options.h"
-#include "pub_core_stacktrace.h"
 #include "pub_core_tooliface.h"
-#include "pub_core_translate.h"
+#include "pub_core_translate.h"        // for VG_(translate)()
 
 /*------------------------------------------------------------*/
 /*--- Globals                                              ---*/

diff --git a/coregrind/m_execontext.c b/coregrind/m_execontext.c
index 649e7467f6ab18bdd89cef33c4e2d04d28fcdc96..224735965818f6732459c4eda8e6886e36fe21ee 100644 (file)
--- a/coregrind/m_execontext.c
+++ b/coregrind/m_execontext.c
@@ -31,7 +31,7 @@
 #include "pub_core_basics.h"
 #include "pub_core_execontext.h"
 #include "pub_core_libcassert.h"
-#include "pub_core_libcprint.h"
+#include "pub_core_libcprint.h"     // For VG_(message)()
 #include "pub_core_mallocfree.h"
 #include "pub_core_options.h"
 #include "pub_core_profile.h"

diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c
index 61504ab291a31da7c9c9f6c95a79b4eebc4f749d..4f765659204bddf56ce39dd8f35bcee0c4e2a742 100644 (file)
--- a/coregrind/m_libcassert.c
+++ b/coregrind/m_libcassert.c
@@ -33,11 +33,11 @@
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"
-#include "pub_core_libcproc.h"
+#include "pub_core_libcproc.h"      // For VG_(gettid)()
 #include "pub_core_options.h"
 #include "pub_core_stacktrace.h"
 #include "pub_core_syscall.h"
-#include "pub_core_tooliface.h"
+#include "pub_core_tooliface.h"     // For VG_(details)
 #include "vki_unistd.h"
 
 /* ---------------------------------------------------------------------

diff --git a/coregrind/m_libcfile.c b/coregrind/m_libcfile.c
index 44dd08628178251d1c7fdbf519a05d42ebc8e334..cc914349bf94c865dc7e890de76d767ee3c2b292 100644 (file)
--- a/coregrind/m_libcfile.c
+++ b/coregrind/m_libcfile.c
@@ -34,7 +34,6 @@
 #include "pub_core_libcfile.h"
 #include "pub_core_libcprint.h"
 #include "pub_core_mallocfree.h"
-#include "pub_core_options.h"
 #include "pub_core_syscall.h"
 #include "vki_unistd.h"
 

diff --git a/coregrind/m_libcmman.c b/coregrind/m_libcmman.c
index 9270eef88855df1d7418b6f31c5c448e206c994f..35db189f8073c32b33dcfbdb7606a79b4df91b50 100644 (file)
--- a/coregrind/m_libcmman.c
+++ b/coregrind/m_libcmman.c
@@ -34,7 +34,6 @@
 #include "pub_core_libcassert.h"
 #include "pub_core_libcmman.h"
 #include "pub_core_libcprint.h"
-#include "pub_core_libcproc.h"
 #include "pub_core_syscall.h"
 #include "vki_unistd.h"
 

diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
index 88e5a7e904eed621789a0e87fbdb5a894fee0948..9e55a94360ca843802a75fdf19141dd5a24061e3 100644 (file)
--- a/coregrind/m_libcprint.c
+++ b/coregrind/m_libcprint.c
@@ -32,11 +32,11 @@
 #include "pub_core_debuglog.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
-#include "pub_core_libcfile.h"
+#include "pub_core_libcfile.h"   // For VG_(write)(), VG_(write_socket)()
 #include "pub_core_libcprint.h"
-#include "pub_core_libcproc.h"
+#include "pub_core_libcproc.h"   // For VG_(getpid)()
 #include "pub_core_options.h"
-#include "valgrind.h"           // for RUNNING_ON_VALGRIND
+#include "valgrind.h"            // For RUNNING_ON_VALGRIND
 
 #include <time.h>
 #include <sys/time.h>

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index b3c99083e6fca7eefea0a1177fd7d44bba785d8e..38cb8320ceab60f799ed976fe4c3807ffd1d5450 100644 (file)
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -31,7 +31,7 @@
 */
 
 #include "pub_core_basics.h"
-#include "pub_core_aspacemgr.h"
+#include "pub_core_aspacemgr.h"     // Needed for pub_core_redir.h
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"
@@ -41,7 +41,7 @@
 #include "pub_core_skiplist.h"
 #include "pub_core_trampoline.h"
 #include "pub_core_transtab.h"
-#include "m_debuginfo/priv_symtab.h"  // XXX: bad!
+#include "m_debuginfo/priv_symtab.h"  // XXX: bad!  For SegInfo internals
 
 /*------------------------------------------------------------*/
 /*--- General purpose redirection.                         ---*/

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index a1a0fbcb9f400ef84fa7d873950d09d4939cf541..4c83d0074e3bd85b6e64d235adf82b17b8443a4b 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -95,8 +95,8 @@
 #include "pub_core_options.h"
 #include "pub_core_scheduler.h"
 #include "pub_core_signals.h"
-#include "pub_core_sigframe.h"
-#include "pub_core_stacktrace.h"
+#include "pub_core_sigframe.h"      // For VG_(sigframe_create)()
+#include "pub_core_stacktrace.h"    // For VG_(get_and_pp_StackTrace)()
 #include "pub_core_syscall.h"
 #include "pub_core_syswrap.h"
 #include "pub_core_tooliface.h"

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index f9e80088c8761f7a6959151152896b4363d8f151..8b1f88dfd068dffa8896b43ccdd86d642f6a9437 100644 (file)
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -30,8 +30,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
-#include "pub_core_aspacemgr.h"
-#include "pub_core_debuginfo.h"
+#include "pub_core_aspacemgr.h"     // For VG_(is_addressable)()
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"
@@ -267,5 +266,5 @@ void VG_(apply_StackTrace)( void(*action)(UInt n, Addr ip),
 
 
 /*--------------------------------------------------------------------*/
-/*--- end                                           m_stacktrace.c ---*/
+/*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/m_translate.c b/coregrind/m_translate.c
index a964ad733ed4924ac6a03cdf2311e80d1b9c41ec..c2babb3c65769ffa4d2c3dd1df9da39e27b0cfa1 100644 (file)
--- a/coregrind/m_translate.c
+++ b/coregrind/m_translate.c
@@ -37,9 +37,9 @@
 #include "pub_core_libcprint.h"
 #include "pub_core_options.h"
 #include "pub_core_profile.h"
-#include "pub_core_redir.h"
-#include "pub_core_signals.h"
-#include "pub_core_tooliface.h"
+#include "pub_core_redir.h"         // For VG_(code_redirect)()
+#include "pub_core_signals.h"       // For VG_(synth_fault_{perms,mapping})()
+#include "pub_core_tooliface.h"     // For VG_(tdict)
 #include "pub_core_translate.h"
 #include "pub_core_transtab.h"
 

diff --git a/coregrind/m_transtab.c b/coregrind/m_transtab.c
index a43453c22efefd54a46bad23f229a4eb7c98326a..557a0050e909e8f82b607d77028d5a6ea26a5685 100644 (file)
--- a/coregrind/m_transtab.c
+++ b/coregrind/m_transtab.c
@@ -30,15 +30,15 @@
 */
 
 #include "pub_core_basics.h"
-#include "pub_core_debuginfo.h"
+#include "pub_core_debuginfo.h"     // For VG_(get_fnname_w_offset)()
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
-#include "pub_core_libcmman.h"
+#include "pub_core_libcmman.h"      // For VG_(get_memory_from_mmap)()
 #include "pub_core_libcprint.h"
 #include "pub_core_options.h"
-#include "pub_core_tooliface.h"
+#include "pub_core_tooliface.h"     // For VG_(details).avg_translation_sizeB
 // XXX: this module should not depend on m_translate!
-#include "pub_core_translate.h"
+#include "pub_core_translate.h"     // For VG_(translate)()
 #include "pub_core_transtab.h"
 
 /* #define DEBUG_TRANSTAB */

diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
index d76267c3c08c7e66a4240022bf6fe62a7c2fb374..bb79dc3cab8d6671ebfe2bb9ca1202d017d4b3f1 100644 (file)
--- a/coregrind/vg_preloaded.c
+++ b/coregrind/vg_preloaded.c
@@ -46,8 +46,8 @@
 #include "coregrind.h"
 
 #include "pub_core_basics.h"
-#include "pub_core_debuginfo.h"     // needed for pub_core_redir.h :(
-#include "pub_core_redir.h"
+#include "pub_core_debuginfo.h"  // Needed for pub_core_redir.h
+#include "pub_core_redir.h"      // For VG_NOTIFY_ON_LOAD
 
 /* ---------------------------------------------------------------------
    Hook for running __libc_freeres once the program exits.