|
From: <sv...@va...> - 2012-10-14 16:45:33
|
florian 2012-10-14 17:45:23 +0100 (Sun, 14 Oct 2012)
New Revision: 13042
Log:
Fix some more Char / HChar mixups
Modified files:
trunk/coregrind/m_errormgr.c
trunk/coregrind/m_main.c
trunk/coregrind/m_signals.c
trunk/coregrind/m_tooliface.c
trunk/coregrind/pub_core_errormgr.h
trunk/coregrind/pub_core_signals.h
trunk/coregrind/pub_core_tooliface.h
trunk/include/pub_tool_tooliface.h
Modified: trunk/coregrind/m_tooliface.c (+6 -6)
===================================================================
--- trunk/coregrind/m_tooliface.c 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/m_tooliface.c 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -72,11 +72,11 @@
VG_(details).detail = detail; \
}
-DETAILS(Char*, name)
-DETAILS(Char*, version)
-DETAILS(Char*, description)
-DETAILS(Char*, copyright_author)
-DETAILS(Char*, bug_reports_to)
+DETAILS(const HChar*, name)
+DETAILS(const HChar*, version)
+DETAILS(const HChar*, description)
+DETAILS(const HChar*, copyright_author)
+DETAILS(const HChar*, bug_reports_to)
DETAILS(UInt, avg_translation_sizeB)
@@ -99,7 +99,7 @@
};
/* static */
-Bool VG_(sanity_check_needs)(Char** failmsg)
+Bool VG_(sanity_check_needs)(const HChar** failmsg)
{
Bool any_new_mem_stack_N, any_new_mem_stack_N_w_ECU;
Bool any_new_mem_stack_w_conflicting_otags;
Modified: trunk/coregrind/pub_core_tooliface.h (+6 -6)
===================================================================
--- trunk/coregrind/pub_core_tooliface.h 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/pub_core_tooliface.h 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -63,11 +63,11 @@
typedef
struct {
- Char* name;
- Char* version;
- Char* description;
- Char* copyright_author;
- Char* bug_reports_to;
+ const HChar* name;
+ const HChar* version;
+ const HChar* description;
+ const HChar* copyright_author;
+ const HChar* bug_reports_to;
UInt avg_translation_sizeB;
}
VgDetails;
@@ -240,7 +240,7 @@
Miscellaneous functions
------------------------------------------------------------------ */
-Bool VG_(sanity_check_needs) ( Char** failmsg );
+Bool VG_(sanity_check_needs) ( const HChar** failmsg );
#endif // __PUB_CORE_TOOLIFACE_H
Modified: trunk/coregrind/m_signals.c (+3 -3)
===================================================================
--- trunk/coregrind/m_signals.c 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/m_signals.c 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -1334,9 +1334,9 @@
}
-const Char *VG_(signame)(Int sigNo)
+const HChar *VG_(signame)(Int sigNo)
{
- static Char buf[20];
+ static HChar buf[20];
switch(sigNo) {
case VKI_SIGHUP: return "SIGHUP";
@@ -1562,7 +1562,7 @@
/* Be helpful - decode some more details about this fault */
if (is_signal_from_kernel(tid, sigNo, info->si_code)) {
- const Char *event = NULL;
+ const HChar *event = NULL;
Bool haveaddr = True;
switch(sigNo) {
Modified: trunk/coregrind/m_main.c (+1 -1)
===================================================================
--- trunk/coregrind/m_main.c 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/m_main.c 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -2010,7 +2010,7 @@
/* The tool's "needs" will by now be finalised, since it has no
further opportunity to specify them. So now sanity check
them. */
- Char* s;
+ HChar* s;
Bool ok;
ok = VG_(sanity_check_needs)( &s );
if (!ok) {
Modified: trunk/coregrind/pub_core_errormgr.h (+1 -1)
===================================================================
--- trunk/coregrind/pub_core_errormgr.h 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/pub_core_errormgr.h 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -62,7 +62,7 @@
extern void VG_(show_error_counts_as_XML) ( void );
-extern Bool VG_(is_action_requested) ( Char* action, Bool* clo );
+extern Bool VG_(is_action_requested) ( const HChar* action, Bool* clo );
extern Bool VG_(showing_core_errors) ( void );
Modified: trunk/include/pub_tool_tooliface.h (+5 -5)
===================================================================
--- trunk/include/pub_tool_tooliface.h 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/include/pub_tool_tooliface.h 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -243,10 +243,10 @@
tools distributed with Valgrind that share a version number with
Valgrind. Other tools not distributed as part of Valgrind should
probably have their own version number. */
-extern void VG_(details_name) ( Char* name );
-extern void VG_(details_version) ( Char* version );
-extern void VG_(details_description) ( Char* description );
-extern void VG_(details_copyright_author) ( Char* copyright_author );
+extern void VG_(details_name) ( const HChar* name );
+extern void VG_(details_version) ( const HChar* version );
+extern void VG_(details_description) ( const HChar* description );
+extern void VG_(details_copyright_author) ( const HChar* copyright_author );
/* Average size of a translation, in bytes, so that the translation
storage machinery can allocate memory appropriately. Not critical,
@@ -255,7 +255,7 @@
/* String printed if an `tl_assert' assertion fails or VG_(tool_panic)
is called. Should probably be an email address. */
-extern void VG_(details_bug_reports_to) ( Char* bug_reports_to );
+extern void VG_(details_bug_reports_to) ( const HChar* bug_reports_to );
/* ------------------------------------------------------------------ */
/* Needs */
Modified: trunk/coregrind/m_errormgr.c (+3 -3)
===================================================================
--- trunk/coregrind/m_errormgr.c 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/m_errormgr.c 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -445,7 +445,7 @@
/* Figure out if we want to perform a given action for this error,
possibly by asking the user.
*/
-Bool VG_(is_action_requested) ( Char* action, Bool* clo )
+Bool VG_(is_action_requested) ( const HChar* action, Bool* clo )
{
Char ch, ch2;
Int res;
@@ -1154,7 +1154,7 @@
/* Look for "tool" in a string like "tool1,tool2,tool3" */
-static Bool tool_name_present(Char *name, Char *names)
+static Bool tool_name_present(const HChar *name, Char *names)
{
Bool found;
Char *s = NULL; /* Shut gcc up */
@@ -1181,7 +1181,7 @@
Char* buf = VG_(malloc)("errormgr.losf.1", nBuf);
Char* tool_names;
Char* supp_name;
- Char* err_str = NULL;
+ const HChar* err_str = NULL;
SuppLoc tmp_callers[VG_MAX_SUPP_CALLERS];
// Check it's not a directory.
Modified: trunk/coregrind/pub_core_signals.h (+1 -1)
===================================================================
--- trunk/coregrind/pub_core_signals.h 2012-10-14 17:43:45 +01:00 (rev 13041)
+++ trunk/coregrind/pub_core_signals.h 2012-10-14 17:45:23 +01:00 (rev 13042)
@@ -41,7 +41,7 @@
extern Int VG_(max_signal);
/* Returns the name of the vki signal sigNo */
-extern const Char *VG_(signame)(Int sigNo);
+extern const HChar *VG_(signame)(Int sigNo);
/* Use high signals because native pthreads wants to use low */
#define VG_SIGVGKILL (VG_(max_signal)-0)
|