Make --demangle=no work as advertised.

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

diff --git a/coregrind/vg_demangle.c b/coregrind/vg_demangle.c
index cb141f60aaa2c31a4331924a703ba3451a504b66..c8c7649d6f438bfafc5b75b11cbf5fb5ebe2c8e7 100644 (file)
--- a/coregrind/vg_demangle.c
+++ b/coregrind/vg_demangle.c
@@ -47,8 +47,12 @@
 
 void VG_(demangle) ( Char* orig, Char* result, Int result_size )
 {
-   Int   n_result = 0;
-   Char* demangled = VG_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS );
+   Int   n_result  = 0;
+   Char* demangled = NULL;
+
+   if (VG_(clo_demangle))
+      demangled = VG_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS );
+
    if (demangled) {
       ADD_TO_RESULT(demangled, VG_(strlen)(demangled));
       VG_(free) (VG_AR_DEMANGLE, demangled);

diff --git a/vg_demangle.c b/vg_demangle.c
index cb141f60aaa2c31a4331924a703ba3451a504b66..c8c7649d6f438bfafc5b75b11cbf5fb5ebe2c8e7 100644 (file)
--- a/vg_demangle.c
+++ b/vg_demangle.c
@@ -47,8 +47,12 @@
 
 void VG_(demangle) ( Char* orig, Char* result, Int result_size )
 {
-   Int   n_result = 0;
-   Char* demangled = VG_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS );
+   Int   n_result  = 0;
+   Char* demangled = NULL;
+
+   if (VG_(clo_demangle))
+      demangled = VG_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS );
+
    if (demangled) {
       ADD_TO_RESULT(demangled, VG_(strlen)(demangled));
       VG_(free) (VG_AR_DEMANGLE, demangled);