Char/HChar and constness fixes. Mostly cost center
on allocators which is always a const HChar *
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13089 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/pub_tool_oset.h b/include/pub_tool_oset.h
index 2f8152d..9eb789b 100644
--- a/include/pub_tool_oset.h
+++ b/include/pub_tool_oset.h
@@ -77,7 +77,7 @@
// - Free: frees a chunk of memory allocated with Alloc.
typedef Word (*OSetCmp_t) ( const void* key, const void* elem );
-typedef void* (*OSetAlloc_t) ( HChar* cc, SizeT szB );
+typedef void* (*OSetAlloc_t) ( const HChar* cc, SizeT szB );
typedef void (*OSetFree_t) ( void* p );
/*--------------------------------------------------------------------*/
@@ -99,7 +99,7 @@
// to allow the destruction of any attached resources; if NULL it is not
// called.
-extern OSet* VG_(OSetWord_Create) ( OSetAlloc_t alloc, HChar* cc,
+extern OSet* VG_(OSetWord_Create) ( OSetAlloc_t alloc, const HChar* cc,
OSetFree_t _free );
extern void VG_(OSetWord_Destroy) ( OSet* os );
@@ -197,12 +197,13 @@
// lead to assertions in Valgrind's allocator.
extern OSet* VG_(OSetGen_Create) ( PtrdiffT keyOff, OSetCmp_t cmp,
- OSetAlloc_t alloc, HChar* cc,
+ OSetAlloc_t alloc, const HChar* cc,
OSetFree_t _free);
extern OSet* VG_(OSetGen_Create_With_Pool) ( PtrdiffT keyOff, OSetCmp_t cmp,
- OSetAlloc_t alloc, HChar* cc,
+ OSetAlloc_t alloc,
+ const HChar* cc,
OSetFree_t _free,
SizeT poolSize,
SizeT maxEltSize);