Renamed functions with 'Skin' in them: SK_(pp_SkinError),

SK_(eq_SkinError), MAC_(pp_shared_SkinError)

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

diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index 41a85602ad6bca06b29d698ce5731dcefa9b7ad0..b2020c998451005238152ae23a9bde289810a0ea 100644 (file)
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -39,7 +39,7 @@
 /*--- Comparing and printing errors                        ---*/
 /*------------------------------------------------------------*/
 
-void SK_(pp_SkinError) ( Error* err )
+void SK_(pp_Error) ( Error* err )
 {
    MAC_Error* err_extra = VG_(get_error_extra)(err);
 
@@ -66,7 +66,7 @@ void SK_(pp_SkinError) ( Error* err )
          break;
 
       default: 
-         MAC_(pp_shared_SkinError)(err);
+         MAC_(pp_shared_Error)(err);
          break;
    }
 }

diff --git a/coregrind/toolfuncs.def b/coregrind/toolfuncs.def
index 27ec8ff66184998e7f7d3171b28794bf2882a61b..747a10dc6efb026365b6f5b1f587b5a7fb8d2c62 100644 (file)
--- a/coregrind/toolfuncs.def
+++ b/coregrind/toolfuncs.def
@@ -46,14 +46,14 @@ void,       fini,   Int exitcode
 ## passed to VG_(eq_ExeContext)() if the ExeContexts are considered.  Other
 ## than that, probably don't worry about it unless you have lots of very
 ## similar errors occurring.
-Bool,  eq_SkinError,   VgRes res, Error* e1, Error* e2
+Bool,  eq_Error,       VgRes res, Error* e1, Error* e2
 
 ## Print error context.
-void,  pp_SkinError,   Error* err
+void,  pp_Error,       Error* err
 
 ## Should fill in any details that could be postponed until after the
 ## decision whether to ignore the error (ie. details not affecting the
-## result of SK_(eq_SkinError)()).  This saves time when errors are ignored.
+## result of SK_(eq_Error)()).  This saves time when errors are ignored.
 ## Yuk.
 
 ## Return value: must be the size of the `extra' part in bytes -- used by

diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c
index 73b9953796e2a366ea68fa99b534b828bd6d47a9..26a7d67d568e1f9550028326a58500af049063cd 100644 (file)
--- a/coregrind/vg_errcontext.c
+++ b/coregrind/vg_errcontext.c
@@ -214,7 +214,7 @@ static Bool eq_Error ( VgRes res, Error* e1, Error* e2 )
          return False;
       default: 
          if (VG_(needs).tool_errors)
-            return SK_(eq_SkinError)(res, e1, e2);
+            return SK_(eq_Error)(res, e1, e2);
          else {
             VG_(printf)("\nUnhandled error type: %u. VG_(needs).tool_errors\n"
                         "probably needs to be set.\n",
@@ -239,7 +239,7 @@ static void pp_Error ( Error* err, Bool printCount )
          break;
       default: 
          if (VG_(needs).tool_errors)
-            SK_(pp_SkinError)( err );
+            SK_(pp_Error)( err );
          else {
             VG_(printf)("\nUnhandled error type: %u.  VG_(needs).tool_errors\n"
                         "probably needs to be set?\n",

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index 35fe3e00e9732f40ec8afb90e1f295db8a337d1c..27efc30f247be2f375fb6fb8e694cdba51f2a489 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -2536,7 +2536,7 @@ static void record_lockgraph_error(ThreadId tid, Mutex *mutex,
    VG_(maybe_record_error)(tid, LockGraphErr, mutex->mutexp, "", &err_extra);
 }
 
-Bool SK_(eq_SkinError) ( VgRes not_used, Error* e1, Error* e2 )
+Bool SK_(eq_Error) ( VgRes not_used, Error* e1, Error* e2 )
 {
    Char *e1s, *e2s;
 
@@ -2645,7 +2645,7 @@ static Char *lockset_str(const Char *prefix, const LockSet *lockset)
    return buf;
 }
 
-void SK_(pp_SkinError) ( Error* err )
+void SK_(pp_Error) ( Error* err )
 {
    HelgrindError *extra = (HelgrindError *)VG_(get_error_extra)(err);
    Char buf[100];

diff --git a/include/tool.h.base b/include/tool.h.base
index a39d41cb31d3e2129a4e3c76e2cb2d75b485e95f..4298ab9b8de9b93939465d0c530cdaa0479ef64b 100644 (file)
--- a/include/tool.h.base
+++ b/include/tool.h.base
@@ -1465,7 +1465,7 @@ typedef
    struct _Error
    Error;
 
-/* Useful in SK_(error_matches_suppression)(), SK_(pp_SkinError)(), etc */
+/* Useful in SK_(error_matches_suppression)(), SK_(pp_Error)(), etc */
 ExeContext* VG_(get_error_where)   ( Error* err );
 SuppKind    VG_(get_error_kind)    ( Error* err );
 Addr        VG_(get_error_address) ( Error* err );

diff --git a/memcheck/mac_needs.c b/memcheck/mac_needs.c
index b0883932f1ade6f68331473b1b81d08332577369..e528c6da84e535db79f4305c4be04a6892964fe1 100644 (file)
--- a/memcheck/mac_needs.c
+++ b/memcheck/mac_needs.c
@@ -137,7 +137,7 @@ static Bool eq_AddrInfo ( VgRes res, AddrInfo* ai1, AddrInfo* ai2 )
    are otherwise the same, the faulting addrs and associated rwoffsets
    are allowed to be different.  */
 
-Bool SK_(eq_SkinError) ( VgRes res, Error* e1, Error* e2 )
+Bool SK_(eq_Error) ( VgRes res, Error* e1, Error* e2 )
 {
    MAC_Error* e1_extra = VG_(get_error_extra)(e1);
    MAC_Error* e2_extra = VG_(get_error_extra)(e2);
@@ -193,7 +193,7 @@ Bool SK_(eq_SkinError) ( VgRes res, Error* e1, Error* e2 )
          return True;
 
       case LeakErr:
-         VG_(skin_panic)("Shouldn't get LeakErr in SK_(eq_SkinError),\n"
+         VG_(skin_panic)("Shouldn't get LeakErr in SK_(eq_Error),\n"
                          "since it's handled with VG_(unique_error)()!");
 
       case IllegalMempoolErr:
@@ -202,7 +202,7 @@ Bool SK_(eq_SkinError) ( VgRes res, Error* e1, Error* e2 )
       default: 
          VG_(printf)("Error:\n  unknown error code %d\n",
                      VG_(get_error_kind)(e1));
-         VG_(skin_panic)("unknown error code in SK_(eq_SkinError)");
+         VG_(skin_panic)("unknown error code in SK_(eq_Error)");
    }
 }
 
@@ -266,7 +266,7 @@ void MAC_(pp_AddrInfo) ( Addr a, AddrInfo* ai )
 
 /* This prints out the message for the error types where Memcheck and
    Addrcheck have identical messages */
-void MAC_(pp_shared_SkinError) ( Error* err )
+void MAC_(pp_shared_Error) ( Error* err )
 {
    MAC_Error* err_extra = VG_(get_error_extra)(err);
 
@@ -297,7 +297,7 @@ void MAC_(pp_shared_SkinError) ( Error* err )
                                         "stated on the next line");
                break;
             default: 
-               VG_(skin_panic)("SK_(pp_shared_SkinError)(axskind)");
+               VG_(skin_panic)("SK_(pp_shared_Error)(axskind)");
          }
          VG_(pp_ExeContext)( VG_(get_error_where)(err) );
          MAC_(pp_AddrInfo)(VG_(get_error_address)(err), &err_extra->addrinfo);
@@ -336,7 +336,7 @@ void MAC_(pp_shared_SkinError) ( Error* err )
       default: 
          VG_(printf)("Error:\n  unknown Memcheck/Addrcheck error code %d\n",
                      VG_(get_error_kind)(err));
-         VG_(skin_panic)("unknown error code in MAC_(pp_shared_SkinError)");
+         VG_(skin_panic)("unknown error code in MAC_(pp_shared_Error)");
    }
 }
 

diff --git a/memcheck/mac_shared.h b/memcheck/mac_shared.h
index 850c63c98f42d1e10f6be83203c03799fc8268d0..f9a6e30910e2486ae8b06d25a4491d927408bed8 100644 (file)
--- a/memcheck/mac_shared.h
+++ b/memcheck/mac_shared.h
@@ -327,7 +327,7 @@ extern void MAC_(record_freemismatch_error)( ThreadId tid, Addr a );
 extern void MAC_(record_overlap_error)     ( Char* function, OverlapExtra* oe );
 extern void MAC_(record_illegal_mempool_error) ( ThreadId tid, Addr pool );
 
-extern void MAC_(pp_shared_SkinError)      ( Error* err);
+extern void MAC_(pp_shared_Error)          ( Error* err);
 
 extern MAC_Chunk* MAC_(first_matching_freed_MAC_Chunk)( Bool (*p)(MAC_Chunk*, void*), void* d );
 

diff --git a/memcheck/mc_errcontext.c b/memcheck/mc_errcontext.c
index 8f881472fbd9f65f775fecccf7649bc103cbc15b..9c2e43c12fe1d5e8895d2392e7dce9286e968b02 100644 (file)
--- a/memcheck/mc_errcontext.c
+++ b/memcheck/mc_errcontext.c
@@ -35,7 +35,7 @@
 /*--- Printing errors                                      ---*/
 /*------------------------------------------------------------*/
 
-void SK_(pp_SkinError) ( Error* err )
+void SK_(pp_Error) ( Error* err )
 {
    MAC_Error* err_extra = VG_(get_error_extra)(err);
 
@@ -85,7 +85,7 @@ void SK_(pp_SkinError) ( Error* err )
          break;
       }
       default: 
-         MAC_(pp_shared_SkinError)(err);
+         MAC_(pp_shared_Error)(err);
          break;
    }
 }