From 2546adef8a33f7fd06500c6ac1ea91c60b398957 Mon Sep 17 00:00:00 2001
From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 18 Oct 2012 03:46:42 +0000
Subject: [PATCH] Fix a few Char/Hchar mixups in exp-sgcheck.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13056
---
 exp-sgcheck/pc_common.c | 10 +++++-----
 exp-sgcheck/pc_common.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/exp-sgcheck/pc_common.c b/exp-sgcheck/pc_common.c
index f2b8057be..c8769f8e8 100644
--- a/exp-sgcheck/pc_common.c
+++ b/exp-sgcheck/pc_common.c
@@ -293,7 +293,7 @@ static void emiN ( HChar* format, ... ) /* With NO FORMAT CHECK */
 }
 
 
-static Char* readwrite(SSizeT sszB)
+static HChar* readwrite(SSizeT sszB)
 {
    return ( sszB < 0 ? "write" : "read" );
 }
@@ -348,7 +348,7 @@ void pc_pp_Error ( Error* err )
 
    //----------------------------------------------------------
    case XE_Heap: {
-      Char *place, *legit, *how_invalid;
+      HChar *place, *legit, *how_invalid;
       Addr a    = xe->XE.Heap.addr;
       Seg* vseg = xe->XE.Heap.vseg;
 
@@ -468,7 +468,7 @@ void pc_pp_Error ( Error* err )
    case XE_Arith: {
       Seg*   seg1   = xe->XE.Arith.seg1;
       Seg*   seg2   = xe->XE.Arith.seg2;
-      Char*  which;
+      HChar*  which;
 
       tl_assert(BOTTOM != seg1);
       tl_assert(BOTTOM != seg2 && UNKNOWN != seg2);
@@ -545,7 +545,7 @@ void pc_pp_Error ( Error* err )
       Seg*  seglo = xe->XE.SysParam.seglo;
       Seg*  seghi = xe->XE.SysParam.seghi;
       Char* s     = VG_(get_error_string) (err);
-      Char* what;
+      HChar* what;
 
       tl_assert(BOTTOM != seglo && BOTTOM != seghi);
 
@@ -764,7 +764,7 @@ Bool pc_error_matches_suppression (Error* err, Supp* su)
    }
 }
 
-Char* pc_get_error_name ( Error* err )
+HChar* pc_get_error_name ( Error* err )
 {
    XError *xe = (XError*)VG_(get_error_extra)(err);
    tl_assert(xe);
diff --git a/exp-sgcheck/pc_common.h b/exp-sgcheck/pc_common.h
index cf4059b68..e1c8c0bc5 100644
--- a/exp-sgcheck/pc_common.h
+++ b/exp-sgcheck/pc_common.h
@@ -55,7 +55,7 @@ Bool pc_is_recognised_suppression ( Char* name, Supp *su );
 Bool pc_read_extra_suppression_info ( Int fd, Char** bufpp, 
                                       SizeT* nBufp, Supp* su );
 Bool pc_error_matches_suppression (Error* err, Supp* su);
-Char* pc_get_error_name ( Error* err );
+HChar* pc_get_error_name ( Error* err );
 Bool pc_get_extra_suppression_info ( Error* err,
                                      /*OUT*/Char* buf, Int nBuf );