From: Julian Seward <jseward@acm.org>
Date: Tue, 16 Apr 2002 02:05:49 +0000 (+0000)
Subject: Make --demangle=no work as advertised.
X-Git-Tag: svn/VALGRIND_1_0_3~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4cf8357bdf693ba1c7d36b72517c0477737113;p=thirdparty%2Fvalgrind.git

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 cb141f60aa..c8c7649d6f 100644
--- 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 cb141f60aa..c8c7649d6f 100644
--- 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);