commit 3e7986312a0ffc7646b0552d4c4ea3744a870e73
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Nov 24 19:41:54 2012 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Nov 24 19:41:54 2012 +0000
tree 8ec814d9be349092d64c663f606b033c7aa8cf1d
parent 6bd9dc18c043927c1196caba20a327238a179c42

Fix some casts that removed const-ness as pointed out by
GCC's -Wcast-qual.


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

exp-sgcheck/h_intercepts.c

diff --git a/exp-sgcheck/h_intercepts.c b/exp-sgcheck/h_intercepts.c
index 6873daa..4c054d9 100644
--- a/exp-sgcheck/h_intercepts.c
+++ b/exp-sgcheck/h_intercepts.c
@@ -166,8 +166,8 @@
          if (*s1 == 0) return -1; \
          if (*s2 == 0) return 1; \
          \
-         if (*(unsigned char*)s1 < *(unsigned char*)s2) return -1; \
-         if (*(unsigned char*)s1 > *(unsigned char*)s2) return 1; \
+         if (*(const unsigned char*)s1 < *(const unsigned char*)s2) return -1; \
+         if (*(const unsigned char*)s1 > *(const unsigned char*)s2) return 1; \
          \
          s1++; s2++; n++; \
       } \
@@ -190,8 +190,8 @@
       register UChar c1; \
       register UChar c2; \
       while (True) { \
-         c1 = *(UChar *)s1; \
-         c2 = *(UChar *)s2; \
+         c1 = *(const UChar *)s1; \
+         c2 = *(const UChar *)s2; \
          if (c1 != c2) break; \
          if (c1 == 0) break; \
          s1++; s2++; \
@@ -215,7 +215,7 @@
    { \
       SizeT i; \
       UChar c0 = (UChar)c; \
-      UChar* p = (UChar*)s; \
+      const UChar* p = (const UChar*)s; \
       for (i = 0; i < n; i++) \
          if (p[i] == c0) return (void*)(&p[i]); \
       return NULL; \