2002-04-09 Daniel Jacobowitz <drow@mvista.com>

[deliverable/binutils-gdb.git] / gdb / demangle.c

diff --git a/gdb/demangle.c b/gdb/demangle.c
index 20758befd9f18af935dc530a4ab9c136bcab650f..1fd69be4c58f5c15327bc1881c7aa2ba758d66c7 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -1,5 +1,6 @@
 /* Basic C++ demangling support for GDB.
-   Copyright 1991, 1992, 1996, 1999 Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support.
 
    This file is part of GDB.
@@ -185,7 +186,7 @@ _initialize_demangler (void)
        libiberty_demanglers[ndems].demangling_style != unknown_demangling; 
        ndems++)
     ;
-  demangling_style_names = xmalloc (ndems * sizeof (char *));
+  demangling_style_names = xcalloc (ndems + 1, sizeof (char *));
   for (i = 0;
        libiberty_demanglers[i].demangling_style != unknown_demangling; 
        i++)
@@ -199,7 +200,7 @@ _initialize_demangler (void)
 Use `set demangle-style' without arguments for a list of demangling styles.",
                          &setlist);
   show = add_show_from_set (set, &showlist);
-  set->function.sfunc = set_demangling_command;
+  set_cmd_sfunc (set, set_demangling_command);
 
   /* Set the default demangling style chosen at compilation time. */
   set_demangling_style (DEFAULT_DEMANGLING_STYLE);