|
From: Dirk M. <mu...@kd...> - 2003-12-07 23:29:20
|
CVS commit by mueller:
add some const's in strategic places to make it compile with gcc 3.4
M +3 -3 coregrind/vg_default.c 1.16.2.1
M +3 -3 coregrind/vg_include.h 1.142.2.3
M +1 -1 coregrind/vg_intercept.c 1.18.2.4
M +2 -2 coregrind/vg_libpthread.c 1.130.2.3
M +8 -8 coregrind/vg_mylibc.c 1.45.2.1
M +3 -3 include/vg_skin.h 1.79.2.5
--- valgrind/coregrind/vg_default.c #1.16:1.16.2.1
@@ -46,5 +46,5 @@
static __attribute__ ((noreturn))
-void fund_panic ( Char* fn )
+void fund_panic ( const Char* fn )
{
VG_(printf)(
@@ -57,5 +57,5 @@ void fund_panic ( Char* fn )
static __attribute__ ((noreturn))
-void non_fund_panic ( Char* fn )
+void non_fund_panic ( const Char* fn )
{
VG_(printf)(
@@ -68,5 +68,5 @@ void non_fund_panic ( Char* fn )
static __attribute__ ((noreturn))
-void malloc_panic ( Char* fn )
+void malloc_panic ( const Char* fn )
{
VG_(printf)(
--- valgrind/coregrind/vg_include.h #1.142.2.2:1.142.2.3
@@ -1025,8 +1025,8 @@ extern void VG_(restore_all_host_signals
__PRETTY_FUNCTION__), 0)))
__attribute__ ((__noreturn__))
-extern void VG_(core_assert_fail) ( Char* expr, Char* file,
- Int line, Char* fn );
+extern void VG_(core_assert_fail) ( const Char* expr, const Char* file,
+ UInt line, const Char* fn );
__attribute__ ((__noreturn__))
-extern void VG_(core_panic) ( Char* str );
+extern void VG_(core_panic) ( const Char* str );
/* VG_(brk) not public so skins cannot screw with curr_dataseg_end */
--- valgrind/coregrind/vg_intercept.c #1.18.2.3:1.18.2.4
@@ -218,5 +218,5 @@ void my_exit ( int arg )
static
-void my_assert_fail ( Char* expr, Char* file, Int line, Char* fn )
+void my_assert_fail ( const Char* expr, const Char* file, UInt line, const Char* fn )
{
char buf[1000];
--- valgrind/coregrind/vg_libpthread.c #1.130.2.2:1.130.2.3
@@ -176,5 +176,5 @@ __asm__ (
static
__attribute__((noreturn))
-void barf ( char* str )
+void barf ( const char* str )
{
char buf[1000];
@@ -222,5 +222,5 @@ void vgPlain_unimp ( char* what )
static
-void my_assert_fail ( Char* expr, Char* file, Int line, Char* fn )
+void my_assert_fail ( const Char* expr, const Char* file, UInt line, const Char* fn )
{
char buf[1000];
--- valgrind/coregrind/vg_mylibc.c #1.45:1.45.2.1
@@ -1078,5 +1078,5 @@ Bool VG_(string_match) ( Char* pat, Char
__attribute__ ((noreturn))
-static void report_and_quit ( Char* report )
+static void report_and_quit ( const Char* report )
{
VG_(pp_sched_status)();
@@ -1094,6 +1094,6 @@ static void report_and_quit ( Char* repo
__attribute__ ((noreturn))
-static void assert_fail ( Char* expr, Char* name, Char* report,
- Char* file, Int line, Char* fn )
+static void assert_fail ( const Char* expr, const Char* name, const Char* report,
+ const Char* file, UInt line, const Char* fn )
{
static Bool entered = False;
@@ -1106,5 +1106,5 @@ static void assert_fail ( Char* expr, Ch
}
-void VG_(skin_assert_fail) ( Char* expr, Char* file, Int line, Char* fn )
+void VG_(skin_assert_fail) ( const Char* expr, const Char* file, UInt line, const Char* fn )
{
assert_fail(expr, VG_(details).name, VG_(details).bug_reports_to,
@@ -1112,5 +1112,5 @@ void VG_(skin_assert_fail) ( Char* expr,
}
-void VG_(core_assert_fail) ( Char* expr, Char* file, Int line, Char* fn )
+void VG_(core_assert_fail) ( const Char* expr, const Char* file, UInt line, const Char* fn )
{
assert_fail(expr, "valgrind", VG_EMAIL_ADDR, file, line, fn);
@@ -1118,5 +1118,5 @@ void VG_(core_assert_fail) ( Char* expr,
__attribute__ ((noreturn))
-static void panic ( Char* name, Char* report, Char* str )
+static void panic ( const Char* name, const Char* report, const Char* str )
{
VG_(printf)("\n%s: the `impossible' happened:\n %s\n", name, str);
@@ -1125,10 +1125,10 @@ static void panic ( Char* name, Char* re
}
-void VG_(core_panic) ( Char* str )
+void VG_(core_panic) ( const Char* str )
{
panic("valgrind", VG_EMAIL_ADDR, str);
}
-void VG_(skin_panic) ( Char* str )
+void VG_(skin_panic) ( const Char* str )
{
panic(VG_(details).name, VG_(details).bug_reports_to, str);
--- valgrind/include/vg_skin.h #1.79.2.4:1.79.2.5
@@ -356,5 +356,5 @@ extern void VG_(exit)( Int status )
reporting info, aborts. */
__attribute__ ((__noreturn__))
-extern void VG_(skin_panic) ( Char* str );
+extern void VG_(skin_panic) ( const Char* str );
/* Looks up VG_(client_envp) */
@@ -442,6 +442,6 @@ extern Char* VG_(getcwd) ( Char* buf, In
__attribute__ ((__noreturn__))
-extern void VG_(skin_assert_fail) ( Char* expr, Char* file,
- Int line, Char* fn );
+extern void VG_(skin_assert_fail) ( const Char* expr, const Char* file,
+ UInt line, const Char* fn );
|