Remove ampersand from tool description string so as not to screw up

XML output.  (Ashley Pittman).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10882

diff --git a/exp-ptrcheck/pc_main.c b/exp-ptrcheck/pc_main.c
index 64bee725720ecbe2454eb7ac6654c1a306ff7cd4..e1a42037656b97ce6fb7c0fc8948c4236e24f6ae 100644 (file)
--- a/exp-ptrcheck/pc_main.c
+++ b/exp-ptrcheck/pc_main.c
@@ -155,7 +155,7 @@ static void pc_pre_clo_init(void)
 
    VG_(details_name)            ("exp-ptrcheck");
    VG_(details_version)         (NULL);
-   VG_(details_description)     ("a heap, stack & global array "
+   VG_(details_description)     ("a heap, stack and global array "
                                  "overrun detector");
    VG_(details_copyright_author)(
       "Copyright (C) 2003-2009, and GNU GPL'd, by OpenWorks Ltd et al.");

diff --git a/exp-ptrcheck/tests/filter_stderr b/exp-ptrcheck/tests/filter_stderr
index 78b292ac9a8e965a6b3d2b50c0c5839a47e86578..121929e2d62ccf01bc3c27562d241ffe0f405a0a 100755 (executable)
--- a/exp-ptrcheck/tests/filter_stderr
+++ b/exp-ptrcheck/tests/filter_stderr
@@ -16,7 +16,7 @@ sed "s/__libc_\(.*\) (.*)$/__libc_\1 (...libc...)/" |
 
 # Remove preambly stuff; also postambly stuff
 sed \
--e "/^exp-ptrcheck, a heap, stack & global array overrun detector$/d" \
+-e "/^exp-ptrcheck, a heap, stack and global array overrun detector$/d" \
 -e "/^NOTE: This is an Experimental-Class Valgrind Tool$/d"  \
 -e "/^Copyright (C) 2003-200., and GNU GPL'd, by OpenWorks Ltd et al.$/d" \
 -e "/^For counts of detected and suppressed errors, rerun with: -v$/d" |