summaryrefslogtreecommitdiff
path: root/libiberty/cplus-dem.c
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2004-11-24 03:00:34 +0000
committerDJ Delorie <dj@delorie.com>2004-11-24 03:00:34 +0000
commitb1b7b445f2fa7bc5353e2d7384eed734e1330d3a (patch)
tree042fc90dd90c39bea48d9c365db4b9e419b7f50f /libiberty/cplus-dem.c
parent68a85ab1484137065e59f6f193908794981a9cbb (diff)
downloadgdb-b1b7b445f2fa7bc5353e2d7384eed734e1330d3a.tar.gz
merge from gcc
Diffstat (limited to 'libiberty/cplus-dem.c')
-rw-r--r--libiberty/cplus-dem.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index f3c4464f184..60a54844c23 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -976,7 +976,6 @@ ada_demangle (mangled, option)
int len0;
const char* p;
char *demangled = NULL;
- int at_start_name;
int changed;
size_t demangled_size = 0;
@@ -1029,15 +1028,12 @@ ada_demangle (mangled, option)
i += 1, j += 1)
demangled[j] = mangled[i];
- at_start_name = 1;
while (i < len0)
{
- at_start_name = 0;
-
if (i < len0 - 2 && mangled[i] == '_' && mangled[i + 1] == '_')
{
demangled[j] = '.';
- changed = at_start_name = 1;
+ changed = 1;
i += 2; j += 1;
}
else
@@ -2040,14 +2036,12 @@ demangle_template (work, mangled, tname, trawname, is_type, remember)
int r;
int need_comma = 0;
int success = 0;
- const char *start;
int is_java_array = 0;
string temp;
(*mangled)++;
if (is_type)
{
- start = *mangled;
/* get template name */
if (**mangled == 'z')
{