commit 55085f8680acc89d727e321f3b34cae1a8c4093a
author florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Wed Nov 21 00:36:55 2012 +0000
committer florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Wed Nov 21 00:36:55 2012 +0000
tree aeeec46d722b5774eb90625d504fd1016eb9f456
parent 91639685ee6dbad9fe01af2d8a4841f19faff5ef

Changes for -Wwrite-strings


git-svn-id: svn://svn.valgrind.org/vex/trunk@2564 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/main_main.c

diff --git a/priv/main_main.c b/priv/main_main.c
index cf66cf1..55e99c6 100644
--- a/priv/main_main.c
+++ b/priv/main_main.c
@@ -71,7 +71,7 @@
 /* --------- fwds ... --------- */
 
 static Bool   are_valid_hwcaps ( VexArch arch, UInt hwcaps );
-static HChar* show_hwcaps ( VexArch arch, UInt hwcaps );
+static const HChar* show_hwcaps ( VexArch arch, UInt hwcaps );
 
 
 /* --------- Initialise the library. --------- */
@@ -1070,7 +1070,7 @@
 
 const HChar* LibVEX_ppVexHwCaps ( VexArch arch, UInt hwcaps )
 {
-   HChar* str = show_hwcaps(arch,hwcaps);
+   const HChar* str = show_hwcaps(arch,hwcaps);
    return str ? str : "INVALID";
 }
 
@@ -1107,7 +1107,7 @@
    be NULL for invalid combinations of flags, so these functions also
    serve as a way to validate hwcaps values. */
 
-static HChar* show_hwcaps_x86 ( UInt hwcaps ) 
+static const HChar* show_hwcaps_x86 ( UInt hwcaps ) 
 {
    /* Monotonic, SSE3 > SSE2 > SSE1 > baseline. */
    switch (hwcaps) {
@@ -1131,7 +1131,7 @@
    }
 }
 
-static HChar* show_hwcaps_amd64 ( UInt hwcaps )
+static const HChar* show_hwcaps_amd64 ( UInt hwcaps )
 {
    /* SSE3 and CX16 are orthogonal and > baseline, although we really
       don't expect to come across anything which can do SSE3 but can't
@@ -1169,7 +1169,7 @@
    }
 }
 
-static HChar* show_hwcaps_ppc32 ( UInt hwcaps )
+static const HChar* show_hwcaps_ppc32 ( UInt hwcaps )
 {
    /* Monotonic with complications.  Basically V > F > baseline,
       but once you have F then you can have FX or GX too. */
@@ -1194,7 +1194,7 @@
    return NULL;
 }
 
-static HChar* show_hwcaps_ppc64 ( UInt hwcaps )
+static const HChar* show_hwcaps_ppc64 ( UInt hwcaps )
 {
    /* Monotonic with complications.  Basically V > baseline(==F),
       but once you have F then you can have FX or GX too. */
@@ -1217,7 +1217,7 @@
    return NULL;
 }
 
-static HChar* show_hwcaps_arm ( UInt hwcaps )
+static const HChar* show_hwcaps_arm ( UInt hwcaps )
 {
    Bool N = ((hwcaps & VEX_HWCAPS_ARM_NEON) != 0);
    Bool vfp = ((hwcaps & (VEX_HWCAPS_ARM_VFP |
@@ -1257,7 +1257,7 @@
    return NULL;
 }
 
-static HChar* show_hwcaps_s390x ( UInt hwcaps )
+static const HChar* show_hwcaps_s390x ( UInt hwcaps )
 {
    static const HChar prefix[] = "s390x";
    static const HChar facilities[][6] = {
@@ -1308,7 +1308,7 @@
    return buf;
 }
 
-static HChar* show_hwcaps_mips32 ( UInt hwcaps )
+static const HChar* show_hwcaps_mips32 ( UInt hwcaps )
 {
    if (hwcaps == 0x00010000) return "MIPS-baseline";
    if (hwcaps == 0x00020000) return "Broadcom-baseline";
@@ -1316,7 +1316,7 @@
 }
 
 /* ---- */
-static HChar* show_hwcaps ( VexArch arch, UInt hwcaps )
+static const HChar* show_hwcaps ( VexArch arch, UInt hwcaps )
 {
    switch (arch) {
       case VexArchX86:    return show_hwcaps_x86(hwcaps);