First round of Char/HChar fixes for memcheck.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13071 a5019735-40e9-0310-863c-91ae7b9d1cf9

diff --git a/memcheck/mc_errors.c b/memcheck/mc_errors.c
index 54472636e8b5be580303e781201d863371489f49..2c5ffe06d0d2be00dad6ca9a570a3c488b039f43 100644 (file)
--- a/memcheck/mc_errors.c
+++ b/memcheck/mc_errors.c
@@ -99,7 +99,7 @@ struct _AddrInfo {
       // blocks.
       struct {
          BlockKind   block_kind;
-         Char*       block_desc;    // "block", "mempool" or user-defined
+         const HChar* block_desc;    // "block", "mempool" or user-defined
          SizeT       block_szB;
          PtrdiffT    rwoffset;
          ExeContext* lastchange;
@@ -322,7 +322,7 @@ static void mc_pp_AddrInfo ( Addr a, AddrInfo* ai, Bool maybe_gcc )
          SizeT    block_szB = ai->Addr.Block.block_szB;
          PtrdiffT rwoffset  = ai->Addr.Block.rwoffset;
          SizeT    delta;
-         const    Char* relative;
+         const    HChar* relative;
 
          if (rwoffset < 0) {
             delta    = (SizeT)(-rwoffset);
@@ -412,7 +412,7 @@ static const HChar* xml_leak_kind ( Reachedness lossmode )
 
 static void mc_pp_origin ( ExeContext* ec, UInt okind )
 {
-   HChar* src = NULL;
+   const HChar* src = NULL;
    tl_assert(ec);
 
    switch (okind) {
@@ -1518,7 +1518,7 @@ Bool MC_(error_matches_suppression) ( Error* err, Supp* su )
    }
 }
 
-Char* MC_(get_error_name) ( Error* err )
+HChar* MC_(get_error_name) ( Error* err )
 {
    switch (VG_(get_error_kind)(err)) {
    case Err_RegParam:       return "Param";

diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 051d58109b55e3951c717ed3c8495b78cf08734b..f425307d2272a40cc6516c3acdfeeec6b237f16a 100644 (file)
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -382,7 +382,7 @@ Bool MC_(error_matches_suppression) ( Error* err, Supp* su );
 Bool MC_(get_extra_suppression_info) ( Error* err,
                                        /*OUT*/Char* buf, Int nBuf );
 
-Char* MC_(get_error_name) ( Error* err );
+HChar* MC_(get_error_name) ( Error* err );
 
 /* Recording of errors */
 void MC_(record_address_error) ( ThreadId tid, Addr a, Int szB,
@@ -429,7 +429,7 @@ typedef
       Addr        start;
       SizeT       size;
       ExeContext* where;
-      Char*       desc;
+      HChar*      desc;
    } 
    CGenBlock;
 

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 44055ee2100fdc95063467df31e90f56b9633157..83eb6c991a5a8ecd80c8e553acc0e6f1f5c24c06 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -1373,7 +1373,7 @@ static void set_address_range_perms ( Addr a, SizeT lenT, UWord vabits16,
 
    if (lenT > 256 * 1024 * 1024) {
       if (VG_(clo_verbosity) > 0 && !VG_(clo_xml)) {
-         Char* s = "unknown???";
+         const HChar* s = "unknown???";
          if (vabits16 == VA_BITS16_NOACCESS ) s = "noaccess";
          if (vabits16 == VA_BITS16_UNDEFINED) s = "undefined";
          if (vabits16 == VA_BITS16_DEFINED  ) s = "defined";
@@ -5481,7 +5481,7 @@ static Bool mc_handle_client_request ( ThreadId tid, UWord* arg, UWord* ret )
             /* VG_(printf)("allocated %d %p\n", i, cgbs); */
             cgbs[i].start = arg[1];
             cgbs[i].size  = arg[2];
-            cgbs[i].desc  = VG_(strdup)("mc.mhcr.1", (Char *)arg[3]);
+            cgbs[i].desc  = (HChar *)VG_(strdup)("mc.mhcr.1", (Char *)arg[3]);
             cgbs[i].where = VG_(record_ExeContext) ( tid, 0/*first_ip_delta*/ );
             *ret = i;
          } else

diff --git a/memcheck/mc_malloc_wrappers.c b/memcheck/mc_malloc_wrappers.c
index ca45c47bfc747ef4c256dc398cd28ed90a0e8358..f31fe2a81b4a6f5df40e3da943cc9e983647eed2 100644 (file)
--- a/memcheck/mc_malloc_wrappers.c
+++ b/memcheck/mc_malloc_wrappers.c
@@ -222,7 +222,7 @@ void delete_MC_Chunk (MC_Chunk* mc)
 /*------------------------------------------------------------*/
 
 // XXX: should make this a proper error (bug #79311).
-static Bool complain_about_silly_args(SizeT sizeB, Char* fn)
+static Bool complain_about_silly_args(SizeT sizeB, const HChar* fn)
 {
    // Cast to a signed type to catch any unexpectedly negative args.  We're
    // assuming here that the size asked for is not greater than 2^31 bytes

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index 6dcced38974a724567a2b3695e72e28f779de222..840691e66290fda151f9ae96f2fecfe48f4daf75 100644 (file)
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -3843,7 +3843,7 @@ IRAtom* expr2vbits_Load_WRK ( MCEnv* mce,
                               IRAtom* addr, UInt bias )
 {
    void*    helper;
-   Char*    hname;
+   const HChar* hname;
    IRDirty* di;
    IRTemp   datavbits;
    IRAtom*  addrAct;
@@ -4155,7 +4155,7 @@ void do_shadow_Store ( MCEnv* mce,
    IROp     mkAdd;
    IRType   ty, tyAddr;
    void*    helper = NULL;
-   Char*    hname = NULL;
+   const HChar* hname = NULL;
    IRConst* c;
 
    tyAddr = mce->hWordTy;