projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb: Fix incorrect variable name in scoped_switch_fork_info
[deliverable/binutils-gdb.git]
/
gdb
/
demangle.c
diff --git
a/gdb/demangle.c
b/gdb/demangle.c
index 5430fb62862d3bfce254f5b883773022e9da54aa..29f46968a29c5b0c6539dd8945ffd390e5f5a5d8 100644
(file)
--- a/
gdb/demangle.c
+++ b/
gdb/demangle.c
@@
-1,6
+1,6
@@
/* Basic C++ demangling support for GDB.
/* Basic C++ demangling support for GDB.
- Copyright (C) 1991-201
7
Free Software Foundation, Inc.
+ Copyright (C) 1991-201
9
Free Software Foundation, Inc.
Written by Fred Fish at Cygnus Support.
Written by Fred Fish at Cygnus Support.
@@
-43,8
+43,6
@@
#define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING
#endif
#define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING
#endif
-static void demangle_command (char *, int);
-
/* See documentation in gdb-demangle.h. */
int demangle = 1;
/* See documentation in gdb-demangle.h. */
int demangle = 1;
@@
-106,7
+104,8
@@
show_demangling_style_names(struct ui_file *file, int from_tty,
a malloc'd string, even if it is a null-string. */
static void
a malloc'd string, even if it is a null-string. */
static void
-set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
+set_demangling_command (const char *ignore,
+ int from_tty, struct cmd_list_element *c)
{
const struct demangler_engine *dem;
int i;
{
const struct demangler_engine *dem;
int i;
@@
-159,7
+158,7
@@
is_cplus_marker (int c)
/* Demangle the given string in the current language. */
static void
/* Demangle the given string in the current language. */
static void
-demangle_command (char *args, int from_tty)
+demangle_command (c
onst c
har *args, int from_tty)
{
char *demangled;
const char *name;
{
char *demangled;
const char *name;
@@
-181,11
+180,7
@@
demangle_command (char *args, int from_tty)
else if (strncmp (arg_start, "--", p - arg_start) == 0)
processing_args = 0;
else
else if (strncmp (arg_start, "--", p - arg_start) == 0)
processing_args = 0;
else
- {
- std::string option = extract_arg (&p);
- error (_("Unrecognized option '%s' to demangle command. "
- "Try \"help demangle\"."), option.c_str ());
- }
+ report_unrecognized_option_error ("demangle", arg_start);
arg_start = skip_spaces (p);
}
arg_start = skip_spaces (p);
}
@@
-193,7
+188,7
@@
demangle_command (char *args, int from_tty)
name = arg_start;
if (*name == '\0')
name = arg_start;
if (*name == '\0')
- error (_("Usage: demangle [-l
language] [--] name
"));
+ error (_("Usage: demangle [-l
LANGUAGE] [--] NAME
"));
if (!lang_name.empty ())
{
if (!lang_name.empty ())
{
@@
-267,7
+262,7
@@
Use `set demangle-style' without arguments for a list of demangling styles."),
add_cmd ("demangle", class_support, demangle_command, _("\
Demangle a mangled name.\n\
add_cmd ("demangle", class_support, demangle_command, _("\
Demangle a mangled name.\n\
-Usage: demangle [-l
language] [--] name
\n\
+Usage: demangle [-l
LANGUAGE] [--] NAME
\n\
If LANGUAGE is not specified, NAME is demangled in the current language."),
&cmdlist);
}
If LANGUAGE is not specified, NAME is demangled in the current language."),
&cmdlist);
}
This page took
0.026966 seconds
and
4
git commands to generate.